--------------------- PatchSet 7036 Date: 2005/09/16 07:57:13 Author: serassio Branch: nt-2_5 Tag: (none) Log: Code cleanup Members: helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c:1.1.4.10->1.1.4.11 helpers/ntlm_auth/NTLMSSP-WIN32/ntlm.h:1.1.4.8->1.1.4.9 helpers/ntlm_auth/NTLMSSP-WIN32/ntlm_auth.c:1.1.4.19->1.1.4.20 Index: squid/helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/ntlm_auth/NTLMSSP-WIN32/Attic/libntlmssp.c,v retrieving revision 1.1.4.10 retrieving revision 1.1.4.11 diff -u -r1.1.4.10 -r1.1.4.11 --- squid/helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c 28 Aug 2004 12:15:17 -0000 1.1.4.10 +++ squid/helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c 16 Sep 2005 07:57:13 -0000 1.1.4.11 @@ -16,8 +16,11 @@ typedef unsigned char uchar; -#include "squid.h" +#include "util.h" #include "ntlm.h" +#if HAVE_CTYPE_H +#include +#endif #include #include Index: squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm.h =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/ntlm_auth/NTLMSSP-WIN32/Attic/ntlm.h,v retrieving revision 1.1.4.8 retrieving revision 1.1.4.9 diff -u -r1.1.4.8 -r1.1.4.9 --- squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm.h 3 Jan 2004 14:45:46 -0000 1.1.4.8 +++ squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm.h 16 Sep 2005 07:57:13 -0000 1.1.4.9 @@ -110,4 +110,6 @@ extern char *ntlm_check_auth(ntlm_authenticate * auth, int auth_length); extern void hex_dump(void *, int); +#define safe_free(x) if (x) { free(x); x = NULL; } + #endif /* _NTLM_H_ */ Index: squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm_auth.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/ntlm_auth/NTLMSSP-WIN32/Attic/ntlm_auth.c,v retrieving revision 1.1.4.19 retrieving revision 1.1.4.20 diff -u -r1.1.4.19 -r1.1.4.20 --- squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm_auth.c 4 Mar 2004 21:01:58 -0000 1.1.4.19 +++ squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm_auth.c 16 Sep 2005 07:57:13 -0000 1.1.4.20 @@ -52,8 +52,14 @@ * */ -#include "squid.h" +#include "util.h" +#if HAVE_GETOPT_H +#include +#endif #include "ntlm.h" +#if HAVE_CTYPE_H +#include +#endif #define BUFFER_SIZE 10240