From f1377429a1dafff08aea5c201257e3a53ecd46e8 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Sat, 5 Jan 2008 12:56:39 +0000
Subject: [PATCH] Add check for ldap_sasl_bind_s() Remove -DLDAP_DEPRECATED
 from CFLAGS

---
 config.h.in  | 3 +++
 configure    | 5 ++---
 configure.in | 4 +---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.h.in b/config.h.in
index bde5d8dd4..fe8b732fd 100644
--- a/config.h.in
+++ b/config.h.in
@@ -221,6 +221,9 @@
 /* Define to 1 if you have the `ldap_initialize' function. */
 #undef HAVE_LDAP_INITIALIZE
 
+/* Define to 1 if you have the `ldap_sasl_bind_s' function. */
+#undef HAVE_LDAP_SASL_BIND_S
+
 /* Define to 1 if you have the `ldap_sasl_interactive_bind_s' function. */
 #undef HAVE_LDAP_SASL_INTERACTIVE_BIND_S
 
diff --git a/configure b/configure
index 52058cea7..f5460cb39 100755
--- a/configure
+++ b/configure
@@ -21956,7 +21956,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 
 
 
-for ac_func in ldap_initialize ldap_start_tls_s ldap_sasl_interactive_bind_s ldapssl_init ldap_search_ext_s ldap_unbind_ext_s ldap_str2dn ldap_create
+
+for ac_func in ldap_initialize ldap_start_tls_s ldap_sasl_interactive_bind_s ldapssl_init ldap_search_ext_s ldap_unbind_ext_s ldap_str2dn ldap_create ldap_sasl_bind_s
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -22684,8 +22685,6 @@ echo "$as_me: WARNING: Unable to locate gssapi.h, you will have to edit the Make
     SUDO_LIBS="${SUDO_LIBS}${LDAP_LIBS}"
     LIBS="$_LIBS"
     LDFLAGS="$_LDFLAGS"
-    # XXX - OpenLDAP has deprecated ldap_get_values()
-    CPPFLAGS="${CPPFLAGS} -DLDAP_DEPRECATED"
 fi
 
 if test -n "$blibpath"; then
diff --git a/configure.in b/configure.in
index 409507233..38394a9e5 100644
--- a/configure.in
+++ b/configure.in
@@ -2302,7 +2302,7 @@ if test ${with_ldap-'no'} != "no"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(HAVE_LBER_H)])
 
-    AC_CHECK_FUNCS(ldap_initialize ldap_start_tls_s ldap_sasl_interactive_bind_s ldapssl_init ldap_search_ext_s ldap_unbind_ext_s ldap_str2dn ldap_create)
+    AC_CHECK_FUNCS(ldap_initialize ldap_start_tls_s ldap_sasl_interactive_bind_s ldapssl_init ldap_search_ext_s ldap_unbind_ext_s ldap_str2dn ldap_create ldap_sasl_bind_s)
     AC_CHECK_HEADERS([sasl/sasl.h])
 
     AC_CHECK_LIB(gssapi, gss_krb5_ccache_name,
@@ -2333,8 +2333,6 @@ if test ${with_ldap-'no'} != "no"; then
     SUDO_LIBS="${SUDO_LIBS}${LDAP_LIBS}"
     LIBS="$_LIBS"
     LDFLAGS="$_LDFLAGS"
-    # XXX - OpenLDAP has deprecated ldap_get_values()
-    CPPFLAGS="${CPPFLAGS} -DLDAP_DEPRECATED"
 fi
 
 dnl
-- 
2.50.1