ITS#6977 fix verbose check in client tools

diff --git a/CHANGES b/CHANGES
index 73a231c05fd5b6984413cefa2fadfa46ed8f0184..753f7c9af749dd90bf3d0d7f4ea529b686b0690a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ OpenLDAP 2.4.26 Engineering
        Fixed libldap ASYNC TLS setup (ITS#6828)
        Fixed libldap with missing \n terminations (ITS#6947)
        Fixed tools double free (ITS#6946)
+       Fixed tools verbose output (ITS#6977)
        Fixed ldapmodify SEGV on invalid LDIF (ITS#6978)
        Added slapd extra_attrs database option (ITS#6513)
        Fixed slapd asserts (ITS#6932)

diff --git a/clients/tools/ldapexop.c b/clients/tools/ldapexop.c
index 316eca1172631c6e3cbf7ea0ef6c03e4c10c8bcf..6fc4d1e3c6b3a1f93746ff3f6bbf92fb85a52e9e 100644 (file)
--- a/clients/tools/ldapexop.c
+++ b/clients/tools/ldapexop.c
@@ -318,7 +318,8 @@ main( int argc, char *argv[] )
                }
        }
 
-       if( verbose || ( code != LDAP_SUCCESS ) || matcheddn || text || refs ) {
+       if( verbose || code != LDAP_SUCCESS ||
+               ( matcheddn && *matcheddn ) || ( text && *text ) || refs ) {
                printf( _("Result: %s (%d)\n"), ldap_err2string( code ), code );
 
                if( text && *text ) {

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index a73a76717410c8ed13189385aa608af4dcc19e4d..81e9c76c9526001aaf5aba0fa359a4a2b57dbcd3 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -374,7 +374,7 @@ main( int argc, char *argv[] )
        }
 
        if( verbose || code != LDAP_SUCCESS ||
-               matcheddn || text || refs || ctrls )
+               ( matcheddn && *matcheddn ) || ( text && *text ) || refs || ctrls )
        {
                printf( _("Result: %s (%d)\n"), ldap_err2string( code ), code );
 

diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index e6c2a237ebc7a7658ce548e5ef3901f8cd11427e..4f4c9f6290578d447077eebd077c606d041dcce5 100644 (file)
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -199,8 +199,8 @@ main( int argc, char *argv[] )
 
 skip:
        ldap_msgfree(res);
-       if ( verbose || ( code != LDAP_SUCCESS ) ||
-               matcheddn || text || refs || ctrls )
+       if ( verbose || code != LDAP_SUCCESS ||
+               ( matcheddn && *matcheddn ) || ( text && *text ) || refs || ctrls )
        {
                printf( _("Result: %s (%d)\n"), ldap_err2string( code ), code );