---------------------
PatchSet 6102 
Date: 2003/12/24 16:21:35
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Workaround for Windows LDAP support

Members: 
	helpers/basic_auth/LDAP/squid_ldap_auth.c:1.2.8.9->1.2.8.10 
	helpers/external_acl/ldap_group/squid_ldap_group.c:1.1.6.8->1.1.6.9 

Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/helpers/basic_auth/LDAP/squid_ldap_auth.c,v
retrieving revision 1.2.8.9
retrieving revision 1.2.8.10
diff -u -r1.2.8.9 -r1.2.8.10
--- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c	11 May 2003 15:01:06 -0000	1.2.8.9
+++ squid/helpers/basic_auth/LDAP/squid_ldap_auth.c	24 Dec 2003 16:21:35 -0000	1.2.8.10
@@ -76,13 +76,22 @@
 #define snprintf _snprintf
 #include <windows.h>
 #include <winldap.h>
+
+#ifdef LDAP_VERSION3
+#if LDAP_VERSION == LDAP_VERSION2
+#undef LDAP_VERSION3
+#endif 
+#endif
+
+#ifdef LDAP_VERSION3
 #define LDAP_OPT_SUCCESS LDAP_SUCCESS
 #undef ldap_start_tls_s
 #if LDAP_UNICODE
 #define ldap_start_tls_s(l,s,c) ldap_start_tls_sW(l,NULL,NULL,s,c)
 #else
 #define ldap_start_tls_s(l,s,c) ldap_start_tls_sA(l,NULL,NULL,s,c)
-#endif
+#endif /* LDAP_UNICODE */
+#endif /* LDAP_VERSION3 */
 #else
 #include <lber.h>
 #include <ldap.h>
Index: squid/helpers/external_acl/ldap_group/squid_ldap_group.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/helpers/external_acl/ldap_group/squid_ldap_group.c,v
retrieving revision 1.1.6.8
retrieving revision 1.1.6.9
diff -u -r1.1.6.8 -r1.1.6.9
--- squid/helpers/external_acl/ldap_group/squid_ldap_group.c	29 Nov 2003 14:30:36 -0000	1.1.6.8
+++ squid/helpers/external_acl/ldap_group/squid_ldap_group.c	24 Dec 2003 16:22:04 -0000	1.1.6.9
@@ -41,13 +41,22 @@
 #define snprintf _snprintf
 #include <windows.h>
 #include <winldap.h>
+
+#ifdef LDAP_VERSION3
+#if LDAP_VERSION == LDAP_VERSION2
+#undef LDAP_VERSION3
+#endif 
+#endif
+
+#ifdef LDAP_VERSION3
 #define LDAP_OPT_SUCCESS LDAP_SUCCESS
 #undef ldap_start_tls_s
 #if NOLDAP_UNICODE
 #define ldap_start_tls_s(l,s,c) ldap_start_tls_sW(l,NULL,NULL,s,c)
 #else
 #define ldap_start_tls_s(l,s,c) ldap_start_tls_sA(l,NULL,NULL,s,c)
-#endif
+#endif /* LDAP_UNICODE */
+#endif /* LDAP_VERSION3 */
 #else
 #include <lber.h>
 #include <ldap.h>