ITS#6977 fix verbose check in client tools

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)

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 ) {

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 );
 

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 );