Rebind cleanup

diff --git a/include/ldap.h b/include/ldap.h
index 085171242d7509d19ddd297650aacb44ae212f79..9376ba943f125fd85b324215befa52fbad95c96f 100644 (file)
--- 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 3876b14c1f93cb9942e4d0d4a2fa594d22ee9d10..4d1d52732bf773d157641c2734981a0998629c16 100644 (file)
--- 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 c21f88c9bfbe96b750019450ccbf416598f514f9..77aca1e03602d455d2acb9aa59b06404b67a7543 100644 (file)
--- 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;