---------------------
PatchSet 11511 
Date: 2007/06/25 23:37:59
Author: hno
Branch: SQUID_2_6
Tag: (none) 
Log:
MFC: Cosmetic squid_ldap_auth cleanups from Squid-3

Merged changes:
2007/06/25 11:20:10	hno	+9 -7	Cosmetic squid_ldap_auth cleanups from Squid-3

Members: 
	helpers/basic_auth/LDAP/squid_ldap_auth.c:1.32.2.1->1.32.2.2 

Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c
===================================================================
RCS file: /cvsroot/squid/squid/helpers/basic_auth/LDAP/squid_ldap_auth.c,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -r1.32.2.1 -r1.32.2.2
--- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c	3 Jun 2007 00:40:28 -0000	1.32.2.1
+++ squid/helpers/basic_auth/LDAP/squid_ldap_auth.c	25 Jun 2007 23:37:59 -0000	1.32.2.2
@@ -32,13 +32,13 @@
  * Changes:
  * 2005-01-07: Henrik Nordstrom <hno@squid-cache.org>
  *             - Added some sanity checks on login names to avoid
- *             users bypassing equality checks by exploring the
- *             overly helpful match capabilities of LDAP
+ *               users bypassing equality checks by exploring the
+ *               overly helpful match capabilities of LDAP
  * 2004-07-17: Henrik Nordstrom <hno@squid-cache.org>
  *             - Corrected non-persistent mode to only issue one
- *             ldap_bind per connection.
+ *               ldap_bind per connection.
  *             - -U option to compare the users password rather
- *             than binding.
+ *               than binding.
  * 2004-03-01: Henrik Nordstrom <hno@squid-cache.org>
  *             - corrected building of search filters to escape
  *               unsafe input
@@ -100,7 +100,9 @@
 #define LDAPAPI __cdecl
 #endif
 #ifdef LDAP_VERSION3
-#define LDAP_OPT_SUCCESS LDAP_SUCCESS
+#ifndef LDAP_OPT_X_TLS
+#define LDAP_OPT_X_TLS 0x6000
+#endif
 /* Some tricks to allow dynamic bind with ldap_start_tls_s entry point at
  * run time.
  */
@@ -547,7 +549,7 @@
 	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);
     }
-/* On windows ldap_start_tls_s is available starting from Windows XP, 
+/* 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_
@@ -639,7 +641,6 @@
     char dn[256];
     int ret = 0;
     LDAP *bind_ld = NULL;
-    int rc;
 
     if (!*password) {
 	/* LDAP can't bind with a blank password. Seen as "anonymous"
@@ -657,6 +658,7 @@
 	char *searchattr[] =
 	{LDAP_NO_ATTRS, NULL};
 	char *userdn;
+	int rc;
 	LDAP *search_ld = persistent_ld;
 
 	if (!search_ld)