allow continuous mode

[openldap] / clients / tools / ldapdelete.c

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 0b91b0847ea106f3751cd40cd34a7ed7f1d6237b..2e7d42f82b6ddf4709942b6229fec25b78e6db2a 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -170,13 +170,11 @@ main( int argc, char **argv )
 
        tool_bind( ld );
 
-       if ( assertion || authzid || manageDIT || manageDSAit || noop ) {
-               tool_server_controls( ld, NULL, 0 );
-       }
+       tool_server_controls( ld, NULL, 0 );
 
        retval = rc = 0;
 
-    if ( fp == NULL ) {
+       if ( fp == NULL ) {
                for ( ; optind < argc; ++optind ) {
                        rc = dodelete( ld, argv[ optind ] );
 
@@ -263,8 +261,10 @@ static int dodelete(
                return rc;
        }
 
-       if( verbose || code != LDAP_SUCCESS ||
-               (matcheddn && *matcheddn) || (text && *text) || (refs && *refs) )
+       if( code != LDAP_SUCCESS ) {
+               tool_perror( "ldap_delete", code, NULL, matcheddn, text, refs );
+       } else if ( verbose && 
+               ((matcheddn && *matcheddn) || (text && *text) || (refs && *refs) ))
        {
                printf( _("Delete Result: %s (%d)\n"),
                        ldap_err2string( code ), code );