cleanup tools

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 732946ea8411ce860a8fd8bee931626ee507ee04..46e6defad511950739ef8cdc4351c3464872f722 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -1238,7 +1238,7 @@ tool_bind( LDAP *ld )
                rc = ldap_parse_result( ld, result, &err, &matched, &info, &refs,
                        &ctrls, 1 );
                if ( rc != LDAP_SUCCESS ) {
-                       tool_perror( "ldap_bind parse result", rc, NULL, NULL, NULL, NULL );
+                       tool_perror( "ldap_bind parse result", rc, NULL, matched, info, refs );
                        exit( LDAP_LOCAL_ERROR );
                }
 

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index cc727e6708c124ee9fd8336cfd6babb23d5e9818..bbf461c7b4dfdadaac5840c9dc1a2489db770f6a 100644 (file)
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -57,6 +57,10 @@ ldap_url_parse_ext LDAP_P((
        struct ldap_url_desc **ludpp,
        unsigned flags ));
 
+LDAP_F (int) ldap_url_parselist LDAP_P((       /* deprecated, use ldap_url_parselist_ext() */
+       struct ldap_url_desc **ludlist,
+       const char *url ));
+
 LDAP_F (int) ldap_url_parselist_ext LDAP_P((
        struct ldap_url_desc **ludlist,
        const char *url,

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 1c8ead3b52a6c9c3050fcbf33ea0dcb3f58590a8..91e9bb8ae9efbecd4713a7bc75429be0d2ed00b9 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -599,10 +599,6 @@ LDAP_F (LDAPURLDesc *) ldap_url_dup LDAP_P((
 LDAP_F (LDAPURLDesc *) ldap_url_duplist LDAP_P((
        LDAPURLDesc *ludlist ));
 
-LDAP_F (int) ldap_url_parselist LDAP_P((
-       LDAPURLDesc **ludlist,
-       const char *url ));
-
 LDAP_F (int) ldap_url_parsehosts LDAP_P((
        LDAPURLDesc **ludlist,
        const char *hosts,