/* ldapdelete.c - simple program to delete an entry using LDAP */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Portions Copyright 1998-2003 Kurt D. Zeilenga.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission. This
+ * software is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP). Additional significant contributors
+ * include:
+ * Kurt D. Zeilenga
*/
#include "portable.h"
#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/unistd.h>
+#include <ac/socket.h>
+#include <ac/time.h>
#include <ldap.h>
#include "lutil.h"
void
usage( void )
{
- fprintf( stderr,
-"Delete entries from an LDAP server\n\n"
-"usage: %s [options] [dn]...\n"
-" dn: list of DNs to delete. If not given, it will be readed from stdin\n"
-" or from the file specified with \"-f file\".\n"
-"Delete Options:\n"
-" -r delete recursively\n"
- , prog );
+ fprintf( stderr, _("Delete entries from an LDAP server\n\n"));
+ fprintf( stderr, _("usage: %s [options] [dn]...\n"), prog);
+ 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, _(" -r delete recursively\n"));
tool_common_usage();
exit( EXIT_FAILURE );
}
-const char options[] = "r" "cCd:D:e:f:h:H:IkKMnO:p:P:QR:U:vw:WxX:y:Y:Z";
+const char options[] = "r"
+ "cd:D:e:f:h:H:IkKMnO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
int
handle_private_option( int i )
#if 0
int crit;
char *control, *cvalue;
- case 'E': /* delete controls */
- if( version == LDAP_VERSION2 ) {
- fprintf( stderr, "%s: -E incompatible with LDAPv%d\n",
- prog, version );
+ case 'E': /* delete extensions */
+ if( protocol == LDAP_VERSION2 ) {
+ fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
+ prog, protocol );
exit( EXIT_FAILURE );
}
if ( (cvalue = strchr( control, '=' )) != NULL ) {
*cvalue++ = '\0';
}
- fprintf( stderr, "Invalid delete control name: %s\n", control );
+ fprintf( stderr, _("Invalid delete extension name: %s\n"), control );
usage();
#endif
fp = NULL;
+ tool_init( TOOL_DELETE );
prog = lutil_progname( "ldapdelete", argc, argv );
tool_args( argc, argv );
rc = lutil_get_filed_password( pw_file, &passwd );
if( rc ) return EXIT_FAILURE;
} else {
- passwd.bv_val = getpassphrase( "Enter LDAP Password: " );
+ passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
}
}
tool_bind( ld );
- if ( authzid || 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 ] );
}
}
- ldap_unbind( ld );
-
- return( retval );
+ tool_unbind( ld );
+ tool_destroy();
+ return retval;
}
LDAPMessage *res;
if ( verbose ) {
- printf( "%sdeleting entry \"%s\"\n",
- (not ? "!" : ""), dn );
+ printf( _("%sdeleting entry \"%s\"\n"),
+ (dont ? "!" : ""), dn );
}
- if ( not ) {
+ if ( dont ) {
return LDAP_SUCCESS;
}
return rc;
}
- rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, NULL, &res );
- if ( rc < 0 ) {
- ldap_perror( ld, "ldapdelete: ldap_result" );
- return rc;
+ for ( ; ; ) {
+ struct timeval tv;
+
+ if ( tool_check_abandon( ld, id ) ) {
+ return LDAP_CANCELLED;
+ }
+
+ tv.tv_sec = 0;
+ tv.tv_usec = 100000;
+
+ rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
+ if ( rc < 0 ) {
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
+ return rc;
+ }
+
+ if ( rc != 0 ) {
+ break;
+ }
}
rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, NULL, 1 );
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 );
+ printf( _("Delete Result: %s (%d)\n"),
+ ldap_err2string( code ), code );
if( text && *text ) {
- printf( "Additional info: %s\n", text );
+ printf( _("Additional info: %s\n"), text );
}
if( matcheddn && *matcheddn ) {
- printf( "Matched DN: %s\n", matcheddn );
+ printf( _("Matched DN: %s\n"), matcheddn );
}
if( refs ) {
int i;
for( i=0; refs[i]; i++ ) {
- printf("Referral: %s\n", refs[i] );
+ printf(_("Referral: %s\n"), refs[i] );
}
}
}
/*
* Delete all the children of an entry recursively until leaf nodes are reached.
- *
*/
static int deletechildren(
LDAP *ld,
LDAPMessage *res, *e;
int entries;
int rc;
- static char *attrs[] = { "1.1", NULL };
+ static char *attrs[] = { LDAP_NO_ATTRS, NULL };
+ LDAPControl c, *ctrls[2];
+ BerElement *ber = NULL;
+ LDAPMessage *res_se;
+
+ if ( verbose ) printf ( _("deleting children of: %s\n"), dn );
- if ( verbose ) printf ( "deleting children of: %s\n", dn );
/*
* Do a one level search at dn 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" );
+ tool_perror( "ldap_search", rc, NULL, NULL, NULL, NULL );
return( rc );
}
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" );
+ tool_perror( "ldap_prune", rc, NULL, NULL, NULL, NULL );
ber_memfree( dn );
return rc;
}
if ( verbose ) {
- printf( "\tremoving %s\n", dn );
+ printf( _("\tremoving %s\n"), dn );
}
- rc = ldap_delete_s( ld, dn );
+ rc = ldap_delete_ext_s( ld, dn, NULL, NULL );
if ( rc == -1 ) {
- ldap_perror( ld, "ldap_delete" );
+ tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
ber_memfree( dn );
return rc;
}
if ( verbose ) {
- printf( "\t%s removed\n", dn );
+ printf( _("\t%s removed\n"), dn );
}
ber_memfree( dn );
}
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 ) {
+ tool_perror( "ldap_search", rc, NULL, NULL, NULL, NULL );
+ 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_get_option( ld, LDAP_OPT_RESULT_CODE, &rc );
+ tool_perror( "ldap_prune", rc, NULL, NULL, NULL, NULL );
+ ber_memfree( dn );
+ return rc;
+ }
+
+ if ( verbose ) {
+ printf( _("\tremoving %s\n"), dn );
+ }
+
+ rc = ldap_delete_ext_s( ld, dn, NULL, NULL );
+ if ( rc == -1 ) {
+ tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
+ ber_memfree( dn );
+ return rc;
+
+ }
+
+ if ( verbose ) {
+ printf( _("\t%s removed\n"), dn );
+ }
+
+ ber_memfree( dn );
+ }
+ }
+
+ ldap_msgfree( res_se );
return rc;
}