diff options
| author | Jeremy Allison <jra@samba.org> | 1998-08-04 01:01:26 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-08-04 01:01:26 +0000 |
| commit | c0c057c0dfc43c47b2d340e26026136cf001ff0a (patch) | |
| tree | 4fd4267e26907c75c55e9baae80f90a10baf9a04 /source3/smbd/server.c | |
| parent | 31c09de03c656b7309888dbbc5240c31ed81537e (diff) | |
| download | samba-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)
Diffstat (limited to 'source3/smbd/server.c')
| -rw-r--r-- | source3/smbd/server.c | 40 |
1 files changed, 24 insertions, 16 deletions
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); |