From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 15 Jun 2001 04:49:38 +0000 (+0000)
Subject: Rebind cleanup
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~1303
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=55755fea2a28a26a843e60b0b51d4227f3dd1033;p=openldap

Rebind cleanup
---

diff --git a/include/ldap.h b/include/ldap.h
index 085171242d..9376ba943f 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -575,7 +575,7 @@ typedef int (LDAP_REBIND_PROC) LDAP_P((
 LDAP_F( int )
 ldap_set_rebind_proc LDAP_P((
 	LDAP *ld,
-	LDAP_REBIND_PROC *ldap_proc,
+	LDAP_REBIND_PROC *rebind_proc,
 	void *params ));
 
 /*
diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 3876b14c1f..4d1d52732b 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -302,7 +302,7 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc *srvlist, int use_ldsb,
 				Debug( LDAP_DEBUG_TRACE, "Call application rebind_proc\n", 0, 0, 0);
 				err = (*ld->ld_rebind_proc)( ld,
 					bind->ri_url, bind->ri_request, bind->ri_msgid,
-					ld->ld_rebind_params);
+					ld->ld_rebind_params );
 
 				ld->ld_defconn = savedefconn;
 				--lc->lconn_refcnt;
diff --git a/libraries/libldap/test.c b/libraries/libldap/test.c
index c21f88c9bf..77aca1e036 100644
--- a/libraries/libldap/test.c
+++ b/libraries/libldap/test.c
@@ -229,7 +229,10 @@ get_modlist( char *prompt1, char *prompt2, char *prompt3 )
 
 
 static int
-bind_prompt( LDAP *ld, LDAP_CONST char *url, int request, ber_int_t msgid)
+bind_prompt( LDAP *ld,
+	LDAP_CONST char *url,
+	ber_tag_t request, ber_int_t msgid,
+	void *params )
 {
 	static char	dn[256], passwd[256];
 	int	authmethod;
@@ -701,7 +704,7 @@ main( int argc, char **argv )
 				getline( line, sizeof(line), stdin,
 					"Prompt for bind credentials when chasing referrals (0=no, 1=yes)?" );
 				if ( atoi( line ) != 0 ) {
-					ldap_set_rebind_proc( ld, bind_prompt );
+					ldap_set_rebind_proc( ld, bind_prompt, NULL );
 				}
 			}
 			break;