summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-08-04 01:01:26 +0000
committerJeremy Allison <jra@samba.org>1998-08-04 01:01:26 +0000
commitc0c057c0dfc43c47b2d340e26026136cf001ff0a (patch)
tree4fd4267e26907c75c55e9baae80f90a10baf9a04
parent31c09de03c656b7309888dbbc5240c31ed81537e (diff)
downloadsamba-c0c057c0dfc43c47b2d340e26026136cf001ff0a.tar.gz
samba-c0c057c0dfc43c47b2d340e26026136cf001ff0a.tar.bz2
samba-c0c057c0dfc43c47b2d340e26026136cf001ff0a.zip
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)
-rw-r--r--source3/param/loadparm.c1
-rw-r--r--source3/smbd/nttrans.c25
-rw-r--r--source3/smbd/reply.c2
-rw-r--r--source3/smbd/server.c40
4 files changed, 29 insertions, 39 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 008f4e4539..19998ece54 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -555,6 +555,7 @@ static struct parm_struct parm_table[] =
{"log file", P_STRING, P_GLOBAL, &Globals.szLogFile, NULL, NULL, 0},
{"max log size", P_INTEGER, P_GLOBAL, &Globals.max_log_size, NULL, NULL, 0},
{"timestamp logs", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL, NULL, 0},
+ {"debug timestamp", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL, NULL, 0},
{"status", P_BOOL, P_LOCAL, &sDefault.status, NULL, NULL, FLAG_GLOBAL},
{"Protocol Options", P_SEP, P_SEPARATOR},
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);