Sync with HEAD

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 3225f361960a293c966900e71c7e00ba5e4e6ba2..168be83811916981f1fb3b8f8b56c6e25093da75 100644 (file)
--- 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 e6792fe485e943a3229d57eb49c065e6dba78639..7739a17105df6d99fcc1dbc3c9993037ceb6e70e 100644 (file)
--- 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 4bb2b80f8667cb1423a0835899af767ccff1b014..7f738773c51642efde168cbbe01c22345a9b4380 100644 (file)
--- 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 0cc34d7c167f88cde9dc903caec0b79adc3f8f49..f0a409dccf66042a55dc380c6d1e89a7fe51a6dd 100644 (file)
--- 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 355b5d5ed4f4c78533de706a0062444cb573af60..29c2470e7ef4f810b4c1517150d00503cf2b1668 100644 (file)
--- 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