Added ldap_pvt_sasl_bind() prototype to ldap_pvt.h. This

required importing sasl.h into ldap_pvt.h, thus that import
was removed from ldap-int.h.

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index 8e21b5df7ddd94fb605fed83ab2e25226dca7ee2..d1b48c1c2e654ac0decb823536800e00ccf20a81 100644 (file)
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -102,9 +102,13 @@ LIBLDAP_F (int) ldap_pvt_unhex( int c );
 
 #ifdef HAVE_CYRUS_SASL
 /* sasl.c */
+
+#include <sasl.h>
+
 LIBLDAP_F (int) ldap_pvt_sasl_init LDAP_P(( void )); /* clientside init */
 LIBLDAP_F (int) ldap_pvt_sasl_install LDAP_P(( Sockbuf *, void * ));
 LIBLDAP_F (int) ldap_pvt_sasl_err2ldap LDAP_P(( int ));
+LIBLDAP_F (int) ldap_pvt_sasl_bind LDAP_P(( LDAP *, LDAP_CONST char *, LDAP_CONST char *, const sasl_callback_t *, LDAPControl **, LDAPControl ** ));
 #endif /* HAVE_CYRUS_SASL */
 
 /* search.c */

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index eca39c573f2347ef83b286b83374b06f588338cd..06914666c642672eac41b1a694f0f5168a403743 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -30,10 +30,6 @@
 
 #include "ldap_pvt.h"
 
-#ifdef HAVE_CYRUS_SASL
-#include <sasl.h>
-#endif /* HAVE_CYRUS_SASL */
-
 LDAP_BEGIN_DECL
 
 #define LDAP_URL_PREFIX         "ldap://"