From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 16 Aug 2007 09:22:07 +0000 (+0000)
Subject: cleanup tools
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~213
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4bc19cbbb9edbbebe45667ee77867808a866236d;p=openldap

cleanup tools
---

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 732946ea84..46e6defad5 100644
--- 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 cc727e6708..bbf461c7b4 100644
--- 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 1c8ead3b52..91e9bb8ae9 100644
--- 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,