From 167bf3b5f17d9b472611cdc6e70940c6ed6d866d Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 8 Feb 2008 21:38:02 +0000 Subject: [PATCH] ITS#5247 --- CHANGES | 1 + clients/tools/ldapmodify.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index d23513cc31..3345e0d14a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,7 @@ OpenLDAP 2.4 Change Log OpenLDAP 2.4.8 Engineering + Fixed ldapmodify verbose logging (ITS#5247) Fixed slapd include handling (ITS#5276) Fixed slapd non-atomic signal variables (ITS#5248) Fixed slapd-ldif delete (ITS#5265) 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; } -- 2.39.5