diff options
| author | Jeremy Allison <jra@samba.org> | 1998-04-09 20:48:48 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-04-09 20:48:48 +0000 |
| commit | af80d8e98f2f74939d680c6abc21e3f40b927f31 (patch) | |
| tree | fdca9c39f0ce5ad080b57edbbfefb1c315539946 /source3/smbd | |
| parent | 9907a58ca63ec4a8c39709da4a275ddf0b6a3aa3 (diff) | |
| download | samba-af80d8e98f2f74939d680c6abc21e3f40b927f31.tar.gz samba-af80d8e98f2f74939d680c6abc21e3f40b927f31.tar.bz2 samba-af80d8e98f2f74939d680c6abc21e3f40b927f31.zip | |
Makefile, loadparm.c, server.c, smb.h, util.c: Patch from
stn@techfak.uni-kiel.de (Stefan Nehlsen) to get homes from
the NIS+ map.
smbpasswd.c: Tidy up of cli_state structure.
Jeremy.
(This used to be commit fc2295e0f5729585fdb3ee47edb290851d4071c5)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/server.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index d0b0304430..01f9006a42 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -101,7 +101,7 @@ extern fstring remote_machine; extern pstring OriginalDir; /* these can be set by some functions to override the error codes */ -int unix_ERR_class=SUCCESS; +int unix_ERR_class=SMB_SUCCESS; int unix_ERR_code=0; @@ -2303,11 +2303,11 @@ int unix_error_packet(char *inbuf,char *outbuf,int def_class,uint32 def_code,int int ecode=def_code; int i=0; - if (unix_ERR_class != SUCCESS) + if (unix_ERR_class != SMB_SUCCESS) { eclass = unix_ERR_class; ecode = unix_ERR_code; - unix_ERR_class = SUCCESS; + unix_ERR_class = SMB_SUCCESS; unix_ERR_code = 0; } else @@ -4686,12 +4686,12 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize) CVAL(outbuf2,smb_com) = CVAL(inbuf2,smb_com); memcpy(outbuf2+4,inbuf2+4,4); - CVAL(outbuf2,smb_rcls) = SUCCESS; + CVAL(outbuf2,smb_rcls) = SMB_SUCCESS; CVAL(outbuf2,smb_reh) = 0; CVAL(outbuf2,smb_flg) = 0x80 | (CVAL(inbuf2,smb_flg) & 0x8); /* bit 7 set means a reply */ SSVAL(outbuf2,smb_flg2,1); /* say we support long filenames */ - SSVAL(outbuf2,smb_err,SUCCESS); + SSVAL(outbuf2,smb_err,SMB_SUCCESS); SSVAL(outbuf2,smb_tid,SVAL(inbuf2,smb_tid)); SSVAL(outbuf2,smb_pid,SVAL(inbuf2,smb_pid)); SSVAL(outbuf2,smb_uid,SVAL(inbuf2,smb_uid)); @@ -4748,12 +4748,12 @@ int construct_reply(char *inbuf,char *outbuf,int size,int bufsize) set_message(outbuf,0,0,True); memcpy(outbuf+4,inbuf+4,4); - CVAL(outbuf,smb_rcls) = SUCCESS; + 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,SUCCESS); + 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)); |