Commit 167bf3b5 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5247

parent 95dd239d
OpenLDAP 2.4 Change Log OpenLDAP 2.4 Change Log
OpenLDAP 2.4.8 Engineering OpenLDAP 2.4.8 Engineering
Fixed ldapmodify verbose logging (ITS#5247)
Fixed slapd include handling (ITS#5276) Fixed slapd include handling (ITS#5276)
Fixed slapd non-atomic signal variables (ITS#5248) Fixed slapd non-atomic signal variables (ITS#5248)
Fixed slapd-ldif delete (ITS#5265) Fixed slapd-ldif delete (ITS#5265)
......
...@@ -1136,13 +1136,14 @@ domodify( ...@@ -1136,13 +1136,14 @@ domodify(
tool_perror( newentry ? "ldap_add" : "ldap_modify", tool_perror( newentry ? "ldap_add" : "ldap_modify",
rc, NULL, NULL, NULL, NULL ); rc, NULL, NULL, NULL, NULL );
goto done; goto done;
} else if ( verbose ) {
printf( _("modify complete\n") );
} }
rc = process_response( ld, msgid, rc = process_response( ld, msgid,
newentry ? LDAP_RES_ADD : LDAP_RES_MODIFY, dn ); newentry ? LDAP_RES_ADD : LDAP_RES_MODIFY, dn );
if ( verbose && rc == LDAP_SUCCESS ) {
printf( _("modify complete\n") );
}
} else { } else {
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;
} }
...@@ -1168,12 +1169,12 @@ dodelete( ...@@ -1168,12 +1169,12 @@ dodelete(
fprintf( stderr, _("%s: delete failed: %s\n"), prog, dn ); fprintf( stderr, _("%s: delete failed: %s\n"), prog, dn );
tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL ); tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
goto done; goto done;
} else if ( verbose ) {
printf( _("delete complete") );
} }
rc = process_response( ld, msgid, LDAP_RES_DELETE, dn ); rc = process_response( ld, msgid, LDAP_RES_DELETE, dn );
if ( verbose && rc == LDAP_SUCCESS ) {
printf( _("delete complete\n") );
}
} else { } else {
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;
} }
...@@ -1207,12 +1208,12 @@ dorename( ...@@ -1207,12 +1208,12 @@ dorename(
fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn ); fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn );
tool_perror( "ldap_rename", rc, NULL, NULL, NULL, NULL ); tool_perror( "ldap_rename", rc, NULL, NULL, NULL, NULL );
goto done; goto done;
} else {
printf( _("rename completed\n") );
} }
rc = process_response( ld, msgid, LDAP_RES_RENAME, dn ); rc = process_response( ld, msgid, LDAP_RES_RENAME, dn );
if ( verbose && rc == LDAP_SUCCESS ) {
printf( _("rename complete\n") );
}
} else { } else {
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment