From: Howard Chu <hyc@openldap.org>
Date: Sat, 15 Dec 2007 01:51:04 +0000 (+0000)
Subject: ITS#5247 fix verbose completion messages
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~305
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=707a09b7046ae69d41e3e3e4646c6995999cc066;p=openldap

ITS#5247 fix verbose completion messages
---

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index dac9efcd82..332b243ecf 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -1136,13 +1136,14 @@ domodify(
 			tool_perror( newentry ? "ldap_add" : "ldap_modify",
 				rc, NULL, NULL, NULL, NULL );
 			goto done;
-		} else if ( verbose ) {
-			printf( _("modify complete\n") );
 		}
-
 		rc = process_response( ld, msgid,
 			newentry ? LDAP_RES_ADD : LDAP_RES_MODIFY, dn );
 
+		if ( verbose && rc == LDAP_SUCCESS ) {
+			printf( _("modify complete\n") );
+		}
+
 	} else {
 		rc = LDAP_SUCCESS;
 	}
@@ -1168,12 +1169,12 @@ dodelete(
 			fprintf( stderr, _("%s: delete failed: %s\n"), prog, dn );
 			tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
 			goto done;
-		} else if ( verbose ) {
-			printf( _("delete complete") );
 		}
-
 		rc = process_response( ld, msgid, LDAP_RES_DELETE, dn );
 
+		if ( verbose && rc == LDAP_SUCCESS ) {
+			printf( _("delete complete\n") );
+		}
 	} else {
 		rc = LDAP_SUCCESS;
 	}
@@ -1207,12 +1208,12 @@ dorename(
 			fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn );
 			tool_perror( "ldap_rename", rc, NULL, NULL, NULL, NULL );
 			goto done;
-		} else {
-			printf( _("rename completed\n") );
 		}
-
 		rc = process_response( ld, msgid, LDAP_RES_RENAME, dn );
 
+		if ( verbose && rc == LDAP_SUCCESS ) {
+			printf( _("rename complete\n") );
+		}
 	} else {
 		rc = LDAP_SUCCESS;
 	}