From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sat, 6 Nov 2010 23:34:12 +0000 (-0600)
Subject: Check for ldap_start_tls_s
X-Git-Tag: take1~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60727a6fe13aa53733164c7bc94908b7804ac59c;p=thirdparty%2Fsquid.git

Check for ldap_start_tls_s
---

diff --git a/configure.in b/configure.in
index 981889715b..5398c29aa5 100644
--- a/configure.in
+++ b/configure.in
@@ -2820,6 +2820,12 @@ case "$host_os" in
 		dnl
 		AC_CHECK_LIB(ldap,ldap_url_parse,
 		  AC_DEFINE(HAVE_LDAP_URL_PARSE,1,[Define to 1 if you have ldap_url_parse]),)
+
+		dnl
+		dnl Check for ldap_start_tls_s
+		dnl
+		AC_CHECK_LIB(ldap,ldap_start_tls_s,
+		  AC_DEFINE(HAVE_LDAP_START_TLS_S,1,[Define to 1 if you have ldap_start_tls_s]),)
 		;;
 esac
 
diff --git a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
index e5c0a58709..0e093e8375 100644
--- a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
+++ b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
@@ -811,7 +811,7 @@ int BindLDAP(edui_ldap_t *l, char *dn, char *pw, unsigned int t)
     }
 
     /* Bind */
-#if defined(LDAP_AUTH_TLS) && defined(NETSCAPE_SSL)
+#if defined(LDAP_AUTH_TLS) && defined(NETSCAPE_SSL) && HAVE_LDAP_START_TLS_S
     if (l->type == LDAP_AUTH_TLS)
         s = ldap_start_tls_s(l->lp, NULL, NULL);
     else