From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 17 Jan 2008 20:44:28 +0000 (+0000)
Subject: include <mps/ldap_ssl.h> in ldap.c if available
X-Git-Tag: SUDO_1_7_0~225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f6101bb268e0be7092eb99211eb4ff47723ceab;p=sudo

include <mps/ldap_ssl.h> in ldap.c if available
---

diff --git a/config.h.in b/config.h.in
index f4ab5df50..d9a0e81e9 100644
--- a/config.h.in
+++ b/config.h.in
@@ -278,6 +278,9 @@
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
+/* Define to 1 if you have the <mps/ldap_ssl.h> header file. */
+#undef HAVE_MPS_LDAP_SSL_H
+
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
diff --git a/configure b/configure
index c56e0bdef..21f7b16a4 100755
--- a/configure
+++ b/configure
@@ -22146,7 +22146,8 @@ fi
 done
 
 
-for ac_header in sasl/sasl.h
+
+for ac_header in sasl/sasl.h mps/ldap_ssl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
diff --git a/configure.in b/configure.in
index 60349e805..d3641d0ce 100644
--- a/configure.in
+++ b/configure.in
@@ -2313,7 +2313,7 @@ if test ${with_ldap-'no'} != "no"; then
     AC_DEFINE(HAVE_LBER_H)])
 
     AC_CHECK_FUNCS(ldap_initialize ldap_start_tls_s ldap_sasl_interactive_bind_s ldapssl_init ldapssl_set_strength ldap_search_ext_s ldap_unbind_ext_s ldap_str2dn ldap_create ldap_sasl_bind_s)
-    AC_CHECK_HEADERS([sasl/sasl.h])
+    AC_CHECK_HEADERS([sasl/sasl.h] [mps/ldap_ssl.h])
 
     AC_CHECK_LIB(gssapi, gss_krb5_ccache_name,
 	AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME)
diff --git a/ldap.c b/ldap.c
index bb9ce296a..bea40aa68 100644
--- a/ldap.c
+++ b/ldap.c
@@ -54,6 +54,9 @@
 # include <lber.h>
 #endif
 #include <ldap.h>
+#ifdef HAVE_MPS_LDAP_SSL_H
+# include <mps/ldap_ssl.h>
+#endif
 #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S
 # ifdef HAVE_SASL_SASL_H
 #  include <sasl/sasl.h>