loadparm.c: Added "debug timestamp" synonym for Chris.

nttrans.c: Moved common code into function in server.c
           Removed left over debug level 0.
server.c: Moved common code into function in server.c
Jeremy.
(This used to be commit 34ef55b7228155cef40cbdfcdc1fe623c1037bd6)

3 files changed, 28 insertions, 39 deletions

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 4ee271cd6b..a30da8e6e0 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -975,7 +975,6 @@ static ubi_slList change_notify_queue = { NULL, (ubi_slNodePtr)&change_notify_qu
 
 /****************************************************************************
  Setup the common parts of the return packet and send it.
- Code stolen from construct_reply() in server.c
 *****************************************************************************/
 
 static void change_notify_reply_packet(char *inbuf, int error_class, uint32 error_code)
@@ -983,22 +982,7 @@ static void change_notify_reply_packet(char *inbuf, int error_class, uint32 erro
   extern int Client;
   char outbuf[smb_size];
 
-  bzero(outbuf,smb_size);
-
-  CVAL(outbuf,smb_com) = CVAL(inbuf,smb_com);
-  set_message(outbuf,0,0,True);
- 
-  memcpy(outbuf+4,inbuf+4,4);
-  CVAL(outbuf,smb_rcls) = SMB_SUCCESS;
-  CVAL(outbuf,smb_reh) = 0;
-  CVAL(outbuf,smb_flg) = 0x80 | (CVAL(inbuf,smb_flg) & 0x8); /* bit 7 set
-                                 means a reply */
-  SSVAL(outbuf,smb_flg2,1); /* say we support long filenames */
-  SSVAL(outbuf,smb_err,SMB_SUCCESS);
-  SSVAL(outbuf,smb_tid,SVAL(inbuf,smb_tid));
-  SSVAL(outbuf,smb_pid,SVAL(inbuf,smb_pid));
-  SSVAL(outbuf,smb_uid,SVAL(inbuf,smb_uid));
-  SSVAL(outbuf,smb_mid,SVAL(inbuf,smb_mid));
+  construct_reply_common(inbuf, outbuf);
 
   ERROR(error_class,error_code);
   send_smb(Client,outbuf);
@@ -1133,10 +1117,6 @@ static int call_nt_transact_notify_change(char *inbuf, char *outbuf, int length,
                                           int bufsize, int cnum,
                                           char **ppsetup, char **ppparams, char **ppdata)
 {
-#if 0
-  DEBUG(0,("call_nt_transact_notify_change: Should not be called !\n"));
-  return(ERROR(ERRSRV,ERRnosupport));
-#else /* Under development. */
   char *setup = *ppsetup;
   files_struct *fsp;
   int fnum = -1;
@@ -1145,7 +1125,7 @@ static int call_nt_transact_notify_change(char *inbuf, char *outbuf, int length,
 
   fnum = SVAL(setup,4);
 
-  DEBUG(0,("call_nt_transact_notify_change: fnum = %d.\n", fnum));
+  DEBUG(3,("call_nt_transact_notify_change: fnum = %d.\n", fnum));
 
   if(!VALID_FNUM(fnum))
     return(ERROR(ERRDOS,ERRbadfid));
@@ -1207,7 +1187,6 @@ static int call_nt_transact_notify_change(char *inbuf, char *outbuf, int length,
         fnum, fsp->name ));
 
   return -1;
-#endif
 }
 
 /****************************************************************************
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 71544c1b19..2e6ceb93aa 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -82,6 +82,8 @@ int reply_special(char *inbuf,char *outbuf)
 	
 	*name1 = *name2 = 0;
 	
+    bzero(outbuf,smb_size);
+
 	smb_setlen(outbuf,0);
 	
 	switch (msg_type) {
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 97a1a79239..97c54cde04 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -4888,6 +4888,29 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
 }
 
 
+/****************************************************************************
+ Helper function for contruct_reply.
+****************************************************************************/
+
+void construct_reply_common(char *inbuf,char *outbuf)
+{
+  bzero(outbuf,smb_size);
+
+  CVAL(outbuf,smb_com) = CVAL(inbuf,smb_com);
+  set_message(outbuf,0,0,True);
+
+  memcpy(outbuf+4,inbuf+4,4);
+  CVAL(outbuf,smb_rcls) = SMB_SUCCESS;
+  CVAL(outbuf,smb_reh) = 0;
+  CVAL(outbuf,smb_flg) = 0x80 | (CVAL(inbuf,smb_flg) & 0x8); /* bit 7 set
+                                 means a reply */
+  SSVAL(outbuf,smb_flg2,1); /* say we support long filenames */
+  SSVAL(outbuf,smb_err,SMB_SUCCESS);
+  SSVAL(outbuf,smb_tid,SVAL(inbuf,smb_tid));
+  SSVAL(outbuf,smb_pid,SVAL(inbuf,smb_pid));
+  SSVAL(outbuf,smb_uid,SVAL(inbuf,smb_uid));
+  SSVAL(outbuf,smb_mid,SVAL(inbuf,smb_mid));
+}
 
 /****************************************************************************
   construct a reply to the incoming packet
@@ -4905,25 +4928,10 @@ int construct_reply(char *inbuf,char *outbuf,int size,int bufsize)
   chain_fnum = -1;
   reset_chain_pnum();
 
-  bzero(outbuf,smb_size);
-
   if (msg_type != 0)
     return(reply_special(inbuf,outbuf));  
 
-  CVAL(outbuf,smb_com) = CVAL(inbuf,smb_com);
-  set_message(outbuf,0,0,True);
-  
-  memcpy(outbuf+4,inbuf+4,4);
-  CVAL(outbuf,smb_rcls) = SMB_SUCCESS;
-  CVAL(outbuf,smb_reh) = 0;
-  CVAL(outbuf,smb_flg) = 0x80 | (CVAL(inbuf,smb_flg) & 0x8); /* bit 7 set 
-							     means a reply */
-  SSVAL(outbuf,smb_flg2,1); /* say we support long filenames */
-  SSVAL(outbuf,smb_err,SMB_SUCCESS);
-  SSVAL(outbuf,smb_tid,SVAL(inbuf,smb_tid));
-  SSVAL(outbuf,smb_pid,SVAL(inbuf,smb_pid));
-  SSVAL(outbuf,smb_uid,SVAL(inbuf,smb_uid));
-  SSVAL(outbuf,smb_mid,SVAL(inbuf,smb_mid));
+  construct_reply_common(inbuf, outbuf);
 
   outsize = switch_message(type,inbuf,outbuf,size,bufsize);