---------------------
PatchSet 1068 
Date: 2004/09/25 07:59:36
Author: serassio
Branch: nt
Tag: (none) 
Log:
Forgotten to remove some conflicts during merge from HEAD

Members: 
	helpers/basic_auth/LDAP/squid_ldap_auth.c:1.4.12.10->1.4.12.11 
	helpers/external_acl/ldap_group/squid_ldap_group.c:1.5.2.9->1.5.2.10 

Index: squid3/helpers/basic_auth/LDAP/squid_ldap_auth.c
===================================================================
RCS file: /cvsroot/squid-sf//squid3/helpers/basic_auth/LDAP/squid_ldap_auth.c,v
retrieving revision 1.4.12.10
retrieving revision 1.4.12.11
diff -u -r1.4.12.10 -r1.4.12.11
--- squid3/helpers/basic_auth/LDAP/squid_ldap_auth.c	25 Sep 2004 07:51:38 -0000	1.4.12.10
+++ squid3/helpers/basic_auth/LDAP/squid_ldap_auth.c	25 Sep 2004 07:59:36 -0000	1.4.12.11
@@ -501,25 +501,6 @@
 	fprintf(stderr, "\tIf you need to bind as a user to perform searches then use the\n\t-D binddn -w bindpasswd or -D binddn -W secretfile options\n\n");
 	exit(1);
     }
-<<<<<<< squid_ldap_auth.c
-
-/* On windows ldap_start_tls_s is available starting from Windows XP, 
-   so we need to bind at run-time with the function entry point
- */
-#ifdef _SQUID_MSWIN_
-    if (use_tls) {
-
-    	HMODULE WLDAP32Handle;
-
-	WLDAP32Handle = GetModuleHandle("wldap32");
-        if ((Win32_ldap_start_tls_s = (PFldap_start_tls_s) GetProcAddress(WLDAP32Handle, LDAP_START_TLS_S)) == NULL) {
-            fprintf( stderr, PROGRAM_NAME ": ERROR: TLS (-Z) not supported on this platform.\n");
-	    exit(1);
-        }
-    }
-#endif
-
-=======
 
 /* On Windows ldap_start_tls_s is available starting from Windows XP, 
    so we need to bind at run-time with the function entry point
@@ -537,7 +518,6 @@
     }
 #endif
 
->>>>>>> 1.11
     while (fgets(buf, 256, stdin) != NULL) {
 	user = strtok(buf, " \r\n");
 	passwd = strtok(NULL, "\r\n");
Index: squid3/helpers/external_acl/ldap_group/squid_ldap_group.c
===================================================================
RCS file: /cvsroot/squid-sf//squid3/helpers/external_acl/ldap_group/squid_ldap_group.c,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -u -r1.5.2.9 -r1.5.2.10
--- squid3/helpers/external_acl/ldap_group/squid_ldap_group.c	25 Sep 2004 07:51:38 -0000	1.5.2.9
+++ squid3/helpers/external_acl/ldap_group/squid_ldap_group.c	25 Sep 2004 07:59:37 -0000	1.5.2.10
@@ -418,25 +418,6 @@
 	fprintf(stderr, "\tIf you need to bind as a user to perform searches then use the\n\t-D binddn -w bindpasswd or -D binddn -W secretfile options\n\n");
 	exit(1);
     }
-<<<<<<< squid_ldap_group.c
-
-/* On windows ldap_start_tls_s is available starting from Windows XP, 
-   so we need to bind at run-time with the function entry point
- */
-#ifdef _SQUID_MSWIN_
-    if (use_tls) {
-
-    	HMODULE WLDAP32Handle;
-
-	WLDAP32Handle = GetModuleHandle("wldap32");
-        if ((Win32_ldap_start_tls_s = (PFldap_start_tls_s) GetProcAddress(WLDAP32Handle, LDAP_START_TLS_S)) == NULL) {
-            fprintf( stderr, PROGRAM_NAME ": ERROR: TLS (-Z) not supported on this platform.\n");
-	    exit(1);
-        }
-    }
-#endif
-
-=======
 
 /* On Windows ldap_start_tls_s is available starting from Windows XP, 
    so we need to bind at run-time with the function entry point
@@ -454,7 +435,6 @@
     }
 #endif
 
->>>>>>> 1.10
     while (fgets(buf, 256, stdin) != NULL) {
 	int found = 0;
 	if (!strchr(buf, '\n')) {