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/include | |
| 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/include')
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/include/smb.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 993cf46486..ad9a36ca62 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1750,9 +1750,6 @@ int reply_findnclose(char *inbuf,char *outbuf,int length,int bufsize); int reply_transs2(char *inbuf,char *outbuf,int length,int bufsize); int reply_trans2(char *inbuf,char *outbuf,int length,int bufsize); -/*The following definitions come from ubiqx/ubi_dLinkList.c */ - - /*The following definitions come from ufc.c */ char *ufc_crypt(char *key,char *salt); diff --git a/source3/include/smb.h b/source3/include/smb.h index 21bf346c62..33c483d54c 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -887,7 +887,7 @@ struct parm_struct #define smb_base(buf) (((char *)(buf))+4) -#define SUCCESS 0 /* The request was successful. */ +#define SMB_SUCCESS 0 /* The request was successful. */ #define ERRDOS 0x01 /* Error is from the core DOS operating system set. */ #define ERRSRV 0x02 /* Error is generated by the server network file manager.*/ #define ERRHRD 0x03 /* Error is an hardware error. */ |