From: Luke Howard <lukeh@openldap.org>
Date: Wed, 5 Jan 2000 12:56:17 +0000 (+0000)
Subject: Imported <ldap.h> in <ldap_pvt.h> so ldap_pvt_sasl_bind() has necessary
X-Git-Tag: UCDATA_2_4~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5a0bbd7eed189cf627c9b3b186eb277df30de5e8;p=openldap

Imported <ldap.h> in <ldap_pvt.h> so ldap_pvt_sasl_bind() has necessary
types. Changed const sasl_callback_t * to LDAP_CONST sasl_callback_t *.
---

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index a6674d7027..f849375d1c 100644
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -109,11 +109,12 @@ LIBLDAP_F (int) ldap_pvt_unhex( int c );
 /* sasl.c */
 
 #include <sasl.h>
+#include <ldap.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 ** ));
+LIBLDAP_F (int) ldap_pvt_sasl_bind LDAP_P(( LDAP *, LDAP_CONST char *, LDAP_CONST char *, LDAP_CONST sasl_callback_t *, LDAPControl **, LDAPControl ** ));
 #endif /* HAVE_CYRUS_SASL */
 
 /* search.c */
diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index a5cfa17675..2d90e7a6bc 100644
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -608,7 +608,7 @@ ldap_pvt_sasl_bind(
 	LDAP			*ld,
 	LDAP_CONST char		*dn,
 	LDAP_CONST char		*mechanism,
-	const sasl_callback_t	*callbacks,
+	LDAP_CONST sasl_callback_t	*callbacks,
 	LDAPControl		**sctrls,
 	LDAPControl		**cctrls )
 {