From dda840f0ea25e193d00350a998af0d398bad04fc Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 18 Dec 2003 23:49:14 +0000 Subject: [PATCH] Sync with HEAD --- clients/tools/ldapdelete.c | 5 ++--- clients/tools/ldapmodify.c | 2 +- clients/tools/ldapmodrdn.c | 2 +- clients/tools/ldappasswd.c | 10 +++++----- clients/tools/ldapsearch.c | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c index 3225f36196..168be83811 100644 --- a/clients/tools/ldapdelete.c +++ b/clients/tools/ldapdelete.c @@ -197,7 +197,7 @@ main( int argc, char **argv ) } } - ldap_unbind( ld ); + ldap_unbind_ext( ld, NULL, NULL ); return( retval ); } @@ -277,7 +277,6 @@ static int dodelete( /* * Delete all the children of an entry recursively until leaf nodes are reached. - * */ static int deletechildren( LDAP *ld, @@ -286,7 +285,7 @@ static int deletechildren( LDAPMessage *res, *e; int entries; int rc; - static char *attrs[] = { "1.1", NULL }; + static char *attrs[] = { LDAP_NO_ATTRS, NULL }; if ( verbose ) printf ( _("deleting children of: %s\n"), dn ); /* diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index e6792fe485..7739a17105 100644 --- a/clients/tools/ldapmodify.c +++ b/clients/tools/ldapmodify.c @@ -307,7 +307,7 @@ main( int argc, char **argv ) } if ( !not ) { - ldap_unbind( ld ); + ldap_unbind_ext( ld, NULL, NULL ); } if ( rejfp != NULL ) { diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c index 4bb2b80f86..7f738773c5 100644 --- a/clients/tools/ldapmodrdn.c +++ b/clients/tools/ldapmodrdn.c @@ -227,7 +227,7 @@ main(int argc, char **argv) } } - ldap_unbind( ld ); + ldap_unbind_ext( ld, NULL, NULL ); return( retval ); } diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c index 0cc34d7c16..f0a409dccf 100644 --- a/clients/tools/ldappasswd.c +++ b/clients/tools/ldappasswd.c @@ -259,7 +259,7 @@ main( int argc, char *argv[] ) if( ber == NULL ) { perror( "ber_alloc_t" ); - ldap_unbind( ld ); + ldap_unbind_ext( ld, NULL, NULL ); return EXIT_FAILURE; } @@ -289,7 +289,7 @@ main( int argc, char *argv[] ) if( rc < 0 ) { perror( "ber_flatten2" ); - ldap_unbind( ld ); + ldap_unbind_ext( ld, NULL, NULL ); return EXIT_FAILURE; } } @@ -307,7 +307,7 @@ main( int argc, char *argv[] ) if( rc != LDAP_SUCCESS ) { ldap_perror( ld, "ldap_extended_operation" ); - ldap_unbind( ld ); + ldap_unbind_ext( ld, NULL, NULL ); return EXIT_FAILURE; } @@ -339,7 +339,7 @@ main( int argc, char *argv[] ) if( ber == NULL ) { perror( "ber_init" ); - ldap_unbind( ld ); + ldap_unbind_ext( ld, NULL, NULL ); return EXIT_FAILURE; } @@ -383,7 +383,7 @@ main( int argc, char *argv[] ) skip: /* disconnect from server */ - ldap_unbind (ld); + ldap_unbind_ext( ld, NULL, NULL ); return code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c index 355b5d5ed4..29c2470e7e 100644 --- a/clients/tools/ldapsearch.c +++ b/clients/tools/ldapsearch.c @@ -818,7 +818,7 @@ getNextPage: } #endif - ldap_unbind( ld ); + ldap_unbind_ext( ld, NULL, NULL ); #ifdef HAVE_CYRUS_SASL sasl_done(); #endif -- 2.39.5