--------------------- PatchSet 512 Date: 2000/08/08 13:21:12 Author: kinkie Branch: ntlm Tag: (none) Log: Added ward against double-inclusion. Members: ntlm_auth_modules/NTLMSSP/smbval/rfcnb-priv.h:1.1.2.1->1.1.2.2 ntlm_auth_modules/NTLMSSP/smbval/smblib-common.h:1.1.2.1->1.1.2.2 ntlm_auth_modules/NTLMSSP/smbval/smblib-priv.h:1.1.2.1->1.1.2.2 ntlm_auth_modules/NTLMSSP/smbval/std-defines.h:1.1.2.2->1.1.2.3 Index: squid/ntlm_auth_modules/NTLMSSP/smbval/rfcnb-priv.h =================================================================== RCS file: /cvsroot/squid-sf//squid/ntlm_auth_modules/NTLMSSP/smbval/Attic/rfcnb-priv.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/ntlm_auth_modules/NTLMSSP/smbval/rfcnb-priv.h 3 Aug 2000 12:46:25 -0000 1.1.2.1 +++ squid/ntlm_auth_modules/NTLMSSP/smbval/rfcnb-priv.h 8 Aug 2000 13:21:12 -0000 1.1.2.2 @@ -1,3 +1,6 @@ +#ifndef __RFCNB_H__ +#define __RFCNB_H__ + /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation Version 1.0 @@ -149,3 +152,5 @@ extern int RFCNB_errno; extern int RFCNB_saved_errno; /* Save this from point of error */ #endif + +#endif /* __RFCNB_H__ */ Index: squid/ntlm_auth_modules/NTLMSSP/smbval/smblib-common.h =================================================================== RCS file: /cvsroot/squid-sf//squid/ntlm_auth_modules/NTLMSSP/smbval/Attic/smblib-common.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/ntlm_auth_modules/NTLMSSP/smbval/smblib-common.h 3 Aug 2000 12:46:25 -0000 1.1.2.1 +++ squid/ntlm_auth_modules/NTLMSSP/smbval/smblib-common.h 8 Aug 2000 13:22:37 -0000 1.1.2.2 @@ -1,3 +1,6 @@ +#ifndef __SMBLIB_COMMON_H__ +#define __SMBLIB_COMMON_H__ + /* UNIX SMBlib NetBIOS implementation Version 1.0 @@ -182,3 +185,5 @@ char filename[13]; /* The name of the file */ } SMB_CP_dirent; + +#endif /* __SMBLIB_COMMON_H__ */ Index: squid/ntlm_auth_modules/NTLMSSP/smbval/smblib-priv.h =================================================================== RCS file: /cvsroot/squid-sf//squid/ntlm_auth_modules/NTLMSSP/smbval/Attic/smblib-priv.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/ntlm_auth_modules/NTLMSSP/smbval/smblib-priv.h 3 Aug 2000 12:46:25 -0000 1.1.2.1 +++ squid/ntlm_auth_modules/NTLMSSP/smbval/smblib-priv.h 8 Aug 2000 13:24:12 -0000 1.1.2.2 @@ -1,3 +1,6 @@ +#ifndef __SMBLIB_PRIV_H__ +#define __SMBLIB_PRIV_H__ + /* UNIX SMBlib NetBIOS implementation Version 1.0 @@ -576,7 +579,9 @@ }; +#ifndef SMBLIB_DEFAULT_DOMAIN #define SMBLIB_DEFAULT_DOMAIN "STAFF" +#endif #define SMBLIB_DEFAULT_OSNAME "UNIX of some type" #define SMBLIB_DEFAULT_LMTYPE "SMBlib LM2.1 minus a bit" #define SMBLIB_MAX_XMIT 65535 @@ -622,3 +627,5 @@ SMB_Tree_Handle SMB_TreeConnect(SMB_Handle_Type con, SMB_Tree_Handle tree, char *path, char *password, char *dev); + +#endif /* __SMBLIB_PRIV_H__ */ Index: squid/ntlm_auth_modules/NTLMSSP/smbval/std-defines.h =================================================================== RCS file: /cvsroot/squid-sf//squid/ntlm_auth_modules/NTLMSSP/smbval/Attic/std-defines.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/ntlm_auth_modules/NTLMSSP/smbval/std-defines.h 3 Aug 2000 22:32:32 -0000 1.1.2.2 +++ squid/ntlm_auth_modules/NTLMSSP/smbval/std-defines.h 8 Aug 2000 13:25:38 -0000 1.1.2.3 @@ -1,3 +1,6 @@ +#ifndef __STD_DEFINES__ +#define __STD_DEFINES__ + /* RFCNB Standard includes ... */ /* @@ -38,3 +41,5 @@ #define TRUE 1 #define FALSE 0 + +#endif /* __STD_DEFINES__ */