X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=clients%2Ftools%2Fldapmodrdn.c;h=42c37aa31b0d9844726aec742f87bc9c878f172b;hb=ee3f05000055619ec6d4eee48b57fa5cb6085127;hp=53db82726d730af4d525af2a78ebf12708da64bb;hpb=0dcd32372c5e76e6173b8b798da99f043bb3100c;p=openldap
diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 53db82726d..42c37aa31b 100644
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -1,21 +1,47 @@
+/* ldapmodrdn.c - generic program to modify an entry's RDN using LDAP */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/* ldapmodrdn.c - generic program to modify an entry's RDN using LDAP.
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Portions Copyright 1998-2003 Kurt D. Zeilenga.
+ * Portions Copyright 1998-2001 Net Boolean Incorporated.
+ * Portions Copyright 2001-2003 IBM Corporation.
+ * All rights reserved.
*
- * Support for MODIFYDN REQUEST V3 (newSuperior) by:
- *
- * Copyright 1999, Juan C. Gomez, 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
+ * .
+ */
+/* Portions Copyright 1999, Juan C. Gomez, All rights reserved.
* This software is not subject to any license of Silicon Graphics
* Inc. or Purdue University.
*
* Redistribution and use in source and binary forms are permitted
* without restriction or fee of any kind as long as this notice
* is preserved.
+ */
+/* 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
+ * Juan C Gomez
+ */
+
#include "portable.h"
@@ -26,6 +52,8 @@
#include
#include
#include
+#include
+#include
#include
#include "lutil.h"
@@ -40,11 +68,11 @@ static int remove_old_RDN = 0;
static int domodrdn(
- LDAP *ld,
- char *dn,
- char *rdn,
- char *newSuperior,
- int remove ); /* flag: remove old RDN */
+ LDAP *ld,
+ char *dn,
+ char *rdn,
+ char *newSuperior,
+ int remove ); /* flag: remove old RDN */
void
usage( void )
@@ -55,7 +83,11 @@ usage( void )
fprintf( stderr, _(" If not given, the list of modifications is read from stdin or\n"));
fprintf( stderr, _(" from the file specified by \"-f file\" (see man page).\n"));
fprintf( stderr, _("Rename options:\n"));
- fprintf( stderr, _(" -r remove old RDN\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 remove old RDN\n"));
fprintf( stderr, _(" -s newsup new superior entry\n"));
tool_common_usage();
exit( EXIT_FAILURE );
@@ -63,7 +95,7 @@ usage( void )
const char options[] = "rs:"
- "cCd: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";
int
handle_private_option( int i )
@@ -72,7 +104,7 @@ handle_private_option( int i )
#if 0
int crit;
char *control, *cvalue;
- case 'E': /* modrdn controls */
+ case 'E': /* modrdn extensions */
if( protocol == LDAP_VERSION2 ) {
fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
prog, version );
@@ -94,13 +126,13 @@ handle_private_option( int i )
if ( (cvalue = strchr( control, '=' )) != NULL ) {
*cvalue++ = '\0';
}
- fprintf( stderr, _("Invalid modrdn control name: %s\n"), control );
+ fprintf( stderr, _("Invalid modrdn extension name: %s\n"), control );
usage();
#endif
case 'r': /* remove old RDN */
- remove_old_RDN++;
- break;
+ remove_old_RDN++;
+ break;
case 's': /* newSuperior */
if( protocol == LDAP_VERSION2 ) {
@@ -108,9 +140,9 @@ handle_private_option( int i )
prog, protocol );
exit( EXIT_FAILURE );
}
- newSuperior = strdup( optarg );
- protocol = LDAP_VERSION3;
- break;
+ newSuperior = strdup( optarg );
+ protocol = LDAP_VERSION3;
+ break;
default:
return 0;
@@ -122,101 +154,101 @@ handle_private_option( int i )
int
main(int argc, char **argv)
{
- char *entrydn = NULL, *rdn = NULL, buf[ 4096 ];
- FILE *fp;
- LDAP *ld;
+ char *entrydn = NULL, *rdn = NULL, buf[ 4096 ];
+ FILE *fp = NULL;
+ LDAP *ld;
int rc, retval, havedn;
- tool_init();
- prog = lutil_progname( "ldapmodrdn", argc, argv );
+ tool_init( TOOL_MODRDN );
+ prog = lutil_progname( "ldapmodrdn", argc, argv );
tool_args( argc, argv );
- havedn = 0;
- if (argc - optind == 2) {
- if (( rdn = strdup( argv[argc - 1] )) == NULL ) {
- perror( "strdup" );
- return( EXIT_FAILURE );
- }
- if (( entrydn = strdup( argv[argc - 2] )) == NULL ) {
- perror( "strdup" );
- return( EXIT_FAILURE );
- }
- ++havedn;
- } else if ( argc - optind != 0 ) {
- fprintf( stderr, _("%s: invalid number of arguments (%d), only two allowed\n"), prog, argc-optind );
- usage();
- }
-
- if ( infile != NULL ) {
- if (( fp = fopen( infile, "r" )) == NULL ) {
- perror( infile );
- return( EXIT_FAILURE );
+ havedn = 0;
+ if (argc - optind == 2) {
+ if (( rdn = strdup( argv[argc - 1] )) == NULL ) {
+ perror( "strdup" );
+ retval = EXIT_FAILURE;
+ goto fail;
+ }
+ if (( entrydn = strdup( argv[argc - 2] )) == NULL ) {
+ perror( "strdup" );
+ retval = EXIT_FAILURE;
+ goto fail;
+ }
+ ++havedn;
+ } else if ( argc - optind != 0 ) {
+ fprintf( stderr, _("%s: invalid number of arguments (%d), only two allowed\n"), prog, argc-optind );
+ usage();
}
- } else {
- fp = stdin;
- }
-
- ld = tool_conn_setup( 0, 0 );
- 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;
+ if ( infile != NULL ) {
+ if (( fp = fopen( infile, "r" )) == NULL ) {
+ perror( infile );
+ retval = EXIT_FAILURE;
+ goto fail;
}
+ } else {
+ fp = stdin;
}
- tool_bind( ld );
-
- if ( authzid || manageDSAit || noop )
- tool_server_controls( ld, NULL, 0 );
+ ld = tool_conn_setup( 0, 0 );
- retval = rc = 0;
- if (havedn)
- retval = domodrdn( ld, entrydn, rdn, newSuperior, remove_old_RDN );
- else while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
- if ( *buf != '\0' ) { /* blank lines optional, skip */
- buf[ strlen( buf ) - 1 ] = '\0'; /* remove nl */
+ tool_bind( ld );
- if ( havedn ) { /* have DN, get RDN */
- if (( rdn = strdup( buf )) == NULL ) {
- perror( "strdup" );
- return( EXIT_FAILURE );
+ tool_server_controls( ld, NULL, 0 );
+
+ retval = rc = 0;
+ if (havedn)
+ retval = domodrdn( ld, entrydn, rdn, newSuperior, remove_old_RDN );
+ else while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
+ if ( *buf != '\n' ) { /* blank lines optional, skip */
+ buf[ strlen( buf ) - 1 ] = '\0'; /* remove nl */
+
+ if ( havedn ) { /* have DN, get RDN */
+ if (( rdn = strdup( buf )) == NULL ) {
+ perror( "strdup" );
+ retval = EXIT_FAILURE;
+ goto fail;
+ }
+ rc = domodrdn(ld, entrydn, rdn, newSuperior, remove_old_RDN );
+ if ( rc != 0 )
+ retval = rc;
+ havedn = 0;
+ free( rdn ); rdn = NULL;
+ free( entrydn ); entrydn = NULL;
+ } else if ( !havedn ) { /* don't have DN yet */
+ if (( entrydn = strdup( buf )) == NULL ) {
+ retval = EXIT_FAILURE;
+ goto fail;
+ }
+ ++havedn;
+ }
}
- rc = domodrdn(ld, entrydn, rdn, newSuperior, remove_old_RDN );
- if ( rc != 0 )
- retval = rc;
- havedn = 0;
- } else if ( !havedn ) { /* don't have DN yet */
- if (( entrydn = strdup( buf )) == NULL ) {
- perror( "strdup" );
- return( EXIT_FAILURE );
- }
- ++havedn;
- }
}
- }
-
- ldap_unbind( ld );
- return( retval );
+ tool_unbind( ld );
+ tool_destroy();
+fail:
+ if ( fp && fp != stdin ) fclose( fp );
+ if ( entrydn ) free( entrydn );
+ if ( rdn ) free( rdn );
+ return( retval );
}
static int domodrdn(
- LDAP *ld,
- char *dn,
- char *rdn,
- char *newSuperior,
- int remove ) /* flag: remove old RDN */
+ LDAP *ld,
+ char *dn,
+ char *rdn,
+ char *newSuperior,
+ int remove ) /* flag: remove old RDN */
{
int rc, code, id;
char *matcheddn=NULL, *text=NULL, **refs=NULL;
+ LDAPControl **ctrls = NULL;
LDAPMessage *res;
- if ( verbose ) {
+ if ( verbose ) {
printf( _("Renaming \"%s\"\n"), dn );
printf( _("\tnew rdn=\"%s\" (%s old rdn)\n"),
rdn, remove ? _("delete") : _("keep") );
@@ -225,7 +257,7 @@ static int domodrdn(
}
}
- if( not ) return LDAP_SUCCESS;
+ if( dont ) return LDAP_SUCCESS;
rc = ldap_rename( ld, dn, rdn, newSuperior, remove,
NULL, NULL, &id );
@@ -236,13 +268,28 @@ static int domodrdn(
return rc;
}
- rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, NULL, &res );
- if ( rc < 0 ) {
- ldap_perror( ld, "ldapmodrdn: ldap_result" );
- return rc;
+ for ( ; ; ) {
+ struct timeval tv = { 0, 0 };
+
+ 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 );
+ rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, &ctrls, 1 );
if( rc != LDAP_SUCCESS ) {
fprintf( stderr, "%s: ldap_parse_result: %s (%d)\n",
@@ -272,6 +319,11 @@ static int domodrdn(
}
}
+ if (ctrls) {
+ tool_print_ctrls( ld, ctrls );
+ ldap_controls_free( ctrls );
+ }
+
ber_memfree( text );
ber_memfree( matcheddn );
ber_memvfree( (void **) refs );