]> git.sur5r.net Git - openldap/blobdiff - clients/tools/ldapdelete.c
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
[openldap] / clients / tools / ldapdelete.c
index a9ca65929253d586dbb0f1bfd26a0b9d554cf707..ec436cefa6d30a069c969bd8e966cc7bb3da11d4 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * All rights reserved.
  *
@@ -39,6 +39,7 @@
 #include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
+#include <ac/socket.h>
 #include <ac/time.h>
 
 #include <ldap.h>
@@ -50,6 +51,7 @@
 
 
 static int     prune = 0;
+static int sizelimit = -1;
 
 
 static int dodelete LDAP_P((
@@ -58,7 +60,8 @@ static int dodelete LDAP_P((
 
 static int deletechildren LDAP_P((
        LDAP *ld,
-       const char *dn ));
+       const char *dn,
+       int subentries ));
 
 void
 usage( void )
@@ -68,6 +71,10 @@ usage( void )
        fprintf( stderr, _("    dn: list of DNs to delete. If not given, it will be readed from stdin\n"));
        fprintf( stderr, _("        or from the file specified with \"-f file\".\n"));
        fprintf( stderr, _("Delete Options:\n"));
+       fprintf( stderr, _("  -c         continuous operation mode (do not stop on errors)\n"));
+       fprintf( stderr, _("  -f file    read operations from `file'\n"));
+       fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+       fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
        fprintf( stderr, _("  -r         delete recursively\n"));
        tool_common_usage();
        exit( EXIT_FAILURE );
@@ -75,11 +82,13 @@ usage( void )
 
 
 const char options[] = "r"
-       "cd:D:e:f:h:H:IkKMnO:p:P:QR:U:vVw:WxX:y:Y:Z";
+       "cd:D:e:f:h:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:z:Z";
 
 int
 handle_private_option( int i )
 {
+       int ival;
+       char *next;
        switch ( i ) {
 #if 0
                int crit;
@@ -114,6 +123,29 @@ handle_private_option( int i )
                prune = 1;
                break;
 
+       case 'z':       /* size limit */
+               if ( strcasecmp( optarg, "none" ) == 0 ) {
+                       sizelimit = 0;
+
+               } else if ( strcasecmp( optarg, "max" ) == 0 ) {
+                       sizelimit = LDAP_MAXINT;
+
+               } else {
+                       ival = strtol( optarg, &next, 10 );
+                       if ( next == NULL || next[0] != '\0' ) {
+                               fprintf( stderr,
+                                       _("Unable to parse size limit \"%s\"\n"), optarg );
+                               exit( EXIT_FAILURE );
+                       }
+                       sizelimit = ival;
+               }
+               if( sizelimit < 0 || sizelimit > LDAP_MAXINT ) {
+                       fprintf( stderr, _("%s: invalid sizelimit (%d) specified\n"),
+                               prog, sizelimit );
+                       exit( EXIT_FAILURE );
+               }
+               break;
+
        default:
                return 0;
        }
@@ -134,13 +166,11 @@ int
 main( int argc, char **argv )
 {
        char            buf[ 4096 ];
-       FILE            *fp;
+       FILE            *fp = NULL;
        LDAP            *ld;
        int             rc, retval;
 
-    fp = NULL;
-
-       tool_init();
+       tool_init( TOOL_DELETE );
     prog = lutil_progname( "ldapdelete", argc, argv );
 
        tool_args( argc, argv );
@@ -151,32 +181,20 @@ main( int argc, char **argv )
                        exit( EXIT_FAILURE );
            }
        } else {
-       if ( optind >= argc ) {
-           fp = stdin;
+               if ( optind >= argc ) {
+                       fp = stdin;
+               }
        }
-    }
 
        ld = tool_conn_setup( 0, &private_conn_setup );
 
-       if ( pw_file || want_bindpw ) {
-               if ( pw_file ) {
-                       rc = lutil_get_filed_password( pw_file, &passwd );
-                       if( rc ) return EXIT_FAILURE;
-               } else {
-                       passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
-                       passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
-               }
-       }
-
        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 ] );
 
@@ -196,11 +214,11 @@ main( int argc, char **argv )
                                        retval = rc;
                        }
                }
+               if ( fp != stdin )
+                       fclose( fp );
        }
 
-       tool_unbind( ld );
-       tool_destroy();
-    return retval;
+       tool_exit( ld, retval );
 }
 
 
@@ -211,21 +229,26 @@ static int dodelete(
        int id;
        int     rc, code;
        char *matcheddn = NULL, *text = NULL, **refs = NULL;
+       LDAPControl **ctrls = NULL;
        LDAPMessage *res;
+       int subentries = 0;
 
        if ( verbose ) {
                printf( _("%sdeleting entry \"%s\"\n"),
-                       (not ? "!" : ""), dn );
+                       (dont ? "!" : ""), dn );
        }
 
-       if ( not ) {
+       if ( dont ) {
                return LDAP_SUCCESS;
        }
 
        /* If prune is on, remove a whole subtree.  Delete the children of the
         * DN recursively, then the DN requested.
         */
-       if ( prune ) deletechildren( ld, dn );
+       if ( prune ) {
+retry:;
+               deletechildren( ld, dn, subentries );
+       }
 
        rc = ldap_delete_ext( ld, dn, NULL, NULL, &id );
        if ( rc != LDAP_SUCCESS ) {
@@ -246,7 +269,7 @@ static int dodelete(
 
                rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
                if ( rc < 0 ) {
-                       ldap_perror( ld, "ldapdelete: ldap_result" );
+                       tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
                        return rc;
                }
 
@@ -255,16 +278,29 @@ static int dodelete(
                }
        }
 
-       rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, NULL, 1 );
+       rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, &ctrls, 1 );
+
+       switch ( rc ) {
+       case LDAP_SUCCESS:
+               break;
 
-       if( rc != LDAP_SUCCESS ) {
+       case LDAP_NOT_ALLOWED_ON_NONLEAF:
+               if ( prune && !subentries ) {
+                       subentries = 1;
+                       goto retry;
+               }
+               /* fallthru */
+
+       default:
                fprintf( stderr, "%s: ldap_parse_result: %s (%d)\n",
                        prog, ldap_err2string( rc ), rc );
                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 );
@@ -285,6 +321,11 @@ static int dodelete(
                }
        }
 
+       if (ctrls) {
+               tool_print_ctrls( ld, ctrls );
+               ldap_controls_free( ctrls );
+       }
+
        ber_memfree( text );
        ber_memfree( matcheddn );
        ber_memvfree( (void **) refs );
@@ -297,27 +338,55 @@ static int dodelete(
  */
 static int deletechildren(
        LDAP *ld,
-       const char *dn )
+       const char *base,
+       int subentries )
 {
        LDAPMessage *res, *e;
        int entries;
-       int rc;
+       int rc = LDAP_SUCCESS, srch_rc;
        static char *attrs[] = { LDAP_NO_ATTRS, NULL };
-       LDAPControl c, *ctrls[2];
+       LDAPControl c, *ctrls[2], **ctrlsp = NULL;
        BerElement *ber = NULL;
-       LDAPMessage *res_se;
 
-       if ( verbose ) printf ( _("deleting children of: %s\n"), dn );
+       if ( verbose ) printf ( _("deleting children of: %s\n"), base );
+
+       if ( subentries ) {
+               /*
+                * Do a one level search at base for subentry children.
+                */
+
+               if ((ber = ber_alloc_t(LBER_USE_DER)) == NULL) {
+                       return EXIT_FAILURE;
+               }
+               rc = ber_printf( ber, "b", 1 );
+               if ( rc == -1 ) {
+                       ber_free( ber, 1 );
+                       fprintf( stderr, _("Subentries control encoding error!\n"));
+                       return EXIT_FAILURE;
+               }
+               if ( ber_flatten2( ber, &c.ldctl_value, 0 ) == -1 ) {
+                       return EXIT_FAILURE;
+               }
+               c.ldctl_oid = LDAP_CONTROL_SUBENTRIES;
+               c.ldctl_iscritical = 1;
+               ctrls[0] = &c;
+               ctrls[1] = NULL;
+               ctrlsp = ctrls;
+       }
 
        /*
-        * Do a one level search at dn for children.  For each, delete its children.
+        * Do a one level search at base for children.  For each, delete its children.
         */
-
-       rc = ldap_search_ext_s( ld, dn, LDAP_SCOPE_ONELEVEL, NULL, attrs, 1,
-               NULL, NULL, NULL, -1, &res );
-       if ( rc != LDAP_SUCCESS ) {
-               ldap_perror( ld, "ldap_search" );
-               return( rc );
+more:;
+       srch_rc = ldap_search_ext_s( ld, base, LDAP_SCOPE_ONELEVEL, NULL, attrs, 1,
+               ctrlsp, NULL, NULL, sizelimit, &res );
+       switch ( srch_rc ) {
+       case LDAP_SUCCESS:
+       case LDAP_SIZELIMIT_EXCEEDED:
+               break;
+       default:
+               tool_perror( "ldap_search", srch_rc, NULL, NULL, NULL, NULL );
+               return( srch_rc );
        }
 
        entries = ldap_count_entries( ld, res );
@@ -331,15 +400,15 @@ static int deletechildren(
                        char *dn = ldap_get_dn( ld, e );
 
                        if( dn == NULL ) {
-                               ldap_perror( ld, "ldap_prune" );
-                               ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc );
+                               ldap_get_option( ld, LDAP_OPT_RESULT_CODE, &rc );
+                               tool_perror( "ldap_prune", rc, NULL, NULL, NULL, NULL );
                                ber_memfree( dn );
                                return rc;
                        }
 
-                       rc = deletechildren( ld, dn );
-                       if ( rc == -1 ) {
-                               ldap_perror( ld, "ldap_prune" );
+                       rc = deletechildren( ld, dn, 0 );
+                       if ( rc != LDAP_SUCCESS ) {
+                               tool_perror( "ldap_prune", rc, NULL, NULL, NULL, NULL );
                                ber_memfree( dn );
                                return rc;
                        }
@@ -348,9 +417,9 @@ static int deletechildren(
                                printf( _("\tremoving %s\n"), dn );
                        }
 
-                       rc = ldap_delete_s( ld, dn );
-                       if ( rc == -1 ) {
-                               ldap_perror( ld, "ldap_delete" );
+                       rc = ldap_delete_ext_s( ld, dn, NULL, NULL );
+                       if ( rc != LDAP_SUCCESS ) {
+                               tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
                                ber_memfree( dn );
                                return rc;
 
@@ -366,72 +435,9 @@ static int deletechildren(
 
        ldap_msgfree( res );
 
-       /*
-        * Do a one level search at dn for subentry children.
-        */
-
-       if ((ber = ber_alloc_t(LBER_USE_DER)) == NULL) {
-               return EXIT_FAILURE;
-       }
-       rc = ber_printf( ber, "b", 1 );
-       if ( rc == -1 ) {
-               ber_free( ber, 1 );
-               fprintf( stderr, _("Subentries control encoding error!\n"));
-               return EXIT_FAILURE;
-       }
-       if ( ber_flatten2( ber, &c.ldctl_value, 0 ) == -1 ) {
-               return EXIT_FAILURE;
-       }
-       c.ldctl_oid = LDAP_CONTROL_SUBENTRIES;
-       c.ldctl_iscritical = 1;
-       ctrls[0] = &c;
-       ctrls[1] = NULL;
-
-       rc = ldap_search_ext_s( ld, dn, LDAP_SCOPE_ONELEVEL, NULL, attrs, 1,
-               ctrls, NULL, NULL, -1, &res_se );
-       if ( rc != LDAP_SUCCESS ) {
-               ldap_perror( ld, "ldap_search" );
-               return( rc );
-       }
-       ber_free( ber, 1 );
-
-       entries = ldap_count_entries( ld, res_se );
-
-       if ( entries > 0 ) {
-               int i;
-
-               for (e = ldap_first_entry( ld, res_se ), i = 0; e != NULL;
-                       e = ldap_next_entry( ld, e ), i++ )
-               {
-                       char *dn = ldap_get_dn( ld, e );
-
-                       if( dn == NULL ) {
-                               ldap_perror( ld, "ldap_prune" );
-                               ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc );
-                               ber_memfree( dn );
-                               return rc;
-                       }
-
-                       if ( verbose ) {
-                               printf( _("\tremoving %s\n"), dn );
-                       }
-
-                       rc = ldap_delete_s( ld, dn );
-                       if ( rc == -1 ) {
-                               ldap_perror( ld, "ldap_delete" );
-                               ber_memfree( dn );
-                               return rc;
-
-                       }
-                       
-                       if ( verbose ) {
-                               printf( _("\t%s removed\n"), dn );
-                       }
-
-                       ber_memfree( dn );
-               }
+       if ( srch_rc == LDAP_SIZELIMIT_EXCEEDED ) {
+               goto more;
        }
 
-       ldap_msgfree( res_se );
        return rc;
 }