Sync with HEAD

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index c809520b96fff515fdade719ed493efb3fce1ddf..468339fab4b81cacbe9edc61f5c66fd76927e9b0 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -411,7 +411,8 @@ main( int argc, char *argv[] )
 
 done:
        /* disconnect from server */
-       tool_unbind( ld ); 
+       if ( ld )
+               tool_unbind( ld ); 
        tool_destroy();
        return rc;
 }