Renamed squid.h to squid-old.h and config.h to squid.h

[thirdparty/squid.git] / helpers / external_acl / LDAP_group / ext_ldap_group_acl.cc

diff --git a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc
index 14363144680aa407ab9ea5f9e52133b84084d330..2a1a778ff0b032ea688dbf2787686971d5ebe10a 100644 (file)
--- a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc
+++ b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc
@@ -34,8 +34,7 @@
  * as published by the Free Software Foundation; either version 2,
  * or (at your option) any later version.
  */
-#define SQUID_NO_ALLOC_PROTECT 1
-#include "config.h"
+#include "squid.h"
 #include "helpers/defines.h"
 #include "rfc1738.h"
 #include "util.h"
@@ -52,7 +51,7 @@
 #include <ctype.h>
 #endif
 
-#ifdef _SQUID_MSWIN_           /* Native Windows port and MinGW */
+#if _SQUID_MSWIN_              /* Native Windows port and MinGW */
 
 #define snprintf _snprintf
 #include <windows.h>
@@ -231,7 +230,6 @@ main(int argc, char **argv)
     int use_extension_dn = 0;
     int strip_nt_domain = 0;
     int strip_kerberos_realm = 0;
-    int err = 0;
 
     setbuf(stdout, NULL);
 
@@ -453,7 +451,7 @@ main(int argc, char **argv)
     /* 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 _SQUID_MSWIN_
     if (use_tls) {
 
         HMODULE WLDAP32Handle;
@@ -614,7 +612,6 @@ recover:
                 tryagain = 1;
             }
         }
-        err = 0;
     }
     if (ld)
         ldap_unbind(ld);