X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldapmodrdn.c;h=3aa05b10f073d3e363b3d821a61be97aa7829071;hb=8045b54124f0365b3d34d9d3220256f052f2b76b;hp=e293fc530e86dd8d589f88a50ebf52f039ea1238;hpb=a8f7f0b3c7e58302cc847f9bfa5e4ace5db4e85f;p=openldap

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index e293fc530e..3aa05b10f0 100644
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -1,11 +1,30 @@
-/* ldapmodrdn.c - generic program to modify an entry's RDN using LDAP */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* ldapmodrdn.c - generic program to modify an entry's RDN using LDAP.
+ *
+ * Support for MODIFYDN REQUEST V3 (newSuperior) by:
+ * 
+ * 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.
+ *
+ */
 
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
+#include <ac/signal.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
 
@@ -13,52 +32,98 @@
 #include <ldap.h>
 
 static char	*binddn = NULL;
-static char	*passwd = NULL;
-static char	*base = NULL;
+static struct berval passwd = { 0, NULL};
 static char	*ldaphost = NULL;
 static int	ldapport = 0;
+#ifdef HAVE_CYRUS_SASL
+static char	*sasl_authc_id = NULL;
+static char	*sasl_authz_id = NULL;
+static char	*sasl_mech = NULL;
+static int	sasl_integrity = 0;
+static int	sasl_privacy = 0;
+#endif
+static int	use_tls = 0;
 static int	not, verbose, contoper;
 static LDAP	*ld;
 
-#ifdef LDAP_DEBUG
-extern int ldap_debug, lber_debug;
-#endif /* LDAP_DEBUG */
-
-#define safe_realloc( ptr, size )	( ptr == NULL ? malloc( size ) : \
-					 realloc( ptr, size ))
-
-static int domodrdn LDAP_P((
+static int domodrdn(
     LDAP	*ld,
     char	*dn,
     char	*rdn,
-    int		remove));	/* flag: remove old RDN */
+    char	*newSuperior,
+    int		remove );	/* flag: remove old RDN */
+
+static void
+usage( const char *s )
+{
+	fprintf( stderr,
+"Rename LDAP entries\n\n"
+"usage: %s [options] [dn rdn]\n"
+"	dn rdn: If given, rdn will replace the RDN of the entry specified by DN\n"
+"		If not given, the list of modifications is read from stdin or\n"
+"		from the file specified by \"-f file\" (see man page).\n"
+"options:\n"
+"	-c\t\tcontinuous operation mode (do not stop on errors)\n"
+"	-d level\tset LDAP debugging level to `level'\n"
+"	-D binddn\tbind DN\n"
+"	-E\t\trequest SASL privacy (-EE to make it critical)\n"
+"	-f file\t\tdo renames listed in `file'\n"
+"	-h host\t\tLDAP server\n"
+"	-I\t\trequest SASL integrity checking (-II to make it\n"
+"		\tcritical)\n"
+"	-k\t\tuse Kerberos authentication\n"
+"	-K\t\tlike -k, but do only step 1 of the Kerberos bind\n"
+"	-M\t\tenable Manage DSA IT control (-MM to make it critical)\n"
+"	-n\t\tshow what would be done but don't actually do it\n"
+"	-p port\t\tport on LDAP server\n"
+"	-P version\tprocotol version (2 or 3)\n"
+"	-r\t\tremove old RDN\n"
+"	-s newsuperior\tnew superior entry\n"
+"	-U user\t\tSASL authentication identity (username)\n"
+"	-v\t\trun in verbose mode (diagnostics to standard output)\n"
+"	-w passwd\tbind passwd (for simple authentication)\n"
+"	-W\t\tprompt for bind passwd\n"
+"	-X id\t\tSASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
+"	-Y mech\t\tSASL mechanism\n"
+"	-Z\t\trequest the use of TLS (-ZZ to make it critical)\n"
+,		s );
+
+	exit( EXIT_FAILURE );
+}
 
 int
-main( argc, argv )
-    int		argc;
-    char	**argv;
+main(int argc, char **argv)
 {
-    char		*usage = "usage: %s [-nvkc] [-d debug-level] [-h ldaphost] [-p ldapport] [-D binddn] [-w passwd] [ -f file | < entryfile | dn newrdn ]\n";
-    char		*myname,*infile, *entrydn, *rdn, buf[ 4096 ];
+    char		*myname,*infile, *entrydn = NULL, *rdn = NULL, buf[ 4096 ];
     FILE		*fp;
-    int			rc, i, kerberos, remove, havedn, authmethod;
-
-    extern char	*optarg;
-    extern int	optind;
+	int		rc, i, remove, havedn, authmethod, version, want_bindpw, debug, manageDSAit;
+    char	*newSuperior=NULL;
 
     infile = NULL;
-    kerberos = not = contoper = verbose = remove = 0;
+    not = contoper = verbose = remove = want_bindpw = debug = manageDSAit = 0;
+    authmethod = LDAP_AUTH_SIMPLE;
+	version = -1;
 
     myname = (myname = strrchr(argv[0], '/')) == NULL ? argv[0] : ++myname;
 
-    while (( i = getopt( argc, argv, "kKcnvrh:p:D:w:d:f:" )) != EOF ) {
+    while (( i = getopt( argc, argv, "cD:d:Ef:h:IKkMnP:p:rs:U:vWw:X:Y:Z" )) != EOF ) {
 	switch( i ) {
 	case 'k':	/* kerberos bind */
-	    kerberos = 2;
-	    break;
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+		authmethod = LDAP_AUTH_KRBV4;
+#else
+		fprintf( stderr, "%s was not compiled with Kerberos support\n", argv[0] );
+		return( EXIT_FAILURE );
+#endif
+		break;
 	case 'K':	/* kerberos bind, part one only */
-	    kerberos = 1;
-	    break;
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+		authmethod = LDAP_AUTH_KRBV41;
+#else
+		fprintf( stderr, "%s was not compiled with Kerberos support\n", argv[0] );
+		return( EXIT_FAILURE );
+#endif
+		break;
 	case 'c':	/* continuous operation mode */
 	    ++contoper;
 	    break;
@@ -68,15 +133,23 @@ main( argc, argv )
 	case 'D':	/* bind DN */
 	    binddn = strdup( optarg );
 	    break;
+	case 's':	/* newSuperior */
+	    newSuperior = strdup( optarg );
+	    version = LDAP_VERSION3;	/* This option => force V3 */
+	    break;
 	case 'w':	/* password */
-	    passwd = strdup( optarg );
+	    passwd.bv_val = strdup( optarg );
+		{
+			char* p;
+
+			for( p = optarg; *p == '\0'; p++ ) {
+				*p = '*';
+			}
+		}
+		passwd.bv_len = strlen( passwd.bv_val );
 	    break;
 	case 'd':
-#ifdef LDAP_DEBUG
-	    ldap_debug = lber_debug = atoi( optarg );	/* */
-#else /* LDAP_DEBUG */
-	    fprintf( stderr, "compile with -DLDAP_DEBUG for debugging\n" );
-#endif /* LDAP_DEBUG */
+	    debug |= atoi( optarg );
 	    break;
 	case 'f':	/* read from file */
 	    infile = strdup( optarg );
@@ -93,61 +166,282 @@ main( argc, argv )
 	case 'r':	/* remove old RDN */
 	    remove++;
 	    break;
+	case 'M':
+		/* enable Manage DSA IT */
+		manageDSAit++;
+		break;
+	case 'W':
+		want_bindpw++;
+		break;
+	case 'P':
+		switch( atoi(optarg) )
+		{
+		case 2:
+			version = LDAP_VERSION2;
+			break;
+		case 3:
+			version = LDAP_VERSION3;
+			break;
+		default:
+			fprintf( stderr, "protocol version should be 2 or 3\n" );
+			usage( argv[0] );
+			return( EXIT_FAILURE );
+		}
+		break;
+	case 'I':
+#ifdef HAVE_CYRUS_SASL
+		sasl_integrity++;
+		authmethod = LDAP_AUTH_SASL;
+#else
+		fprintf( stderr, "%s was not compiled with SASL support\n",
+			argv[0] );
+		return( EXIT_FAILURE );
+#endif
+		break;
+	case 'E':
+#ifdef HAVE_CYRUS_SASL
+		sasl_privacy++;
+		authmethod = LDAP_AUTH_SASL;
+#else
+		fprintf( stderr, "%s was not compiled with SASL support\n",
+			argv[0] );
+		return( EXIT_FAILURE );
+#endif
+		break;
+	case 'Y':
+#ifdef HAVE_CYRUS_SASL
+		if ( strcasecmp( optarg, "any" ) && strcmp( optarg, "*" ) ) {
+			sasl_mech = strdup( optarg );
+		}
+		authmethod = LDAP_AUTH_SASL;
+#else
+		fprintf( stderr, "%s was not compiled with SASL support\n",
+			argv[0] );
+		return( EXIT_FAILURE );
+#endif
+		break;
+	case 'U':
+#ifdef HAVE_CYRUS_SASL
+		sasl_authc_id = strdup( optarg );
+		authmethod = LDAP_AUTH_SASL;
+#else
+		fprintf( stderr, "%s was not compiled with SASL support\n",
+			argv[0] );
+		return( EXIT_FAILURE );
+#endif
+		break;
+	case 'X':
+#ifdef HAVE_CYRUS_SASL
+		sasl_authz_id = strdup( optarg );
+		authmethod = LDAP_AUTH_SASL;
+#else
+		fprintf( stderr, "%s was not compiled with SASL support\n",
+			argv[0] );
+		return( EXIT_FAILURE );
+#endif
+		break;
+	case 'Z':
+#ifdef HAVE_TLS
+		use_tls++;
+#else
+		fprintf( stderr, "%s was not compiled with TLS support\n",
+			argv[0] );
+		return( EXIT_FAILURE );
+#endif
+		break;
 	default:
-	    fprintf( stderr, usage, argv[0] );
-	    exit( 1 );
+	    usage( argv[0] );
+	    return( EXIT_FAILURE );
 	}
     }
 
+	if ( ( authmethod == LDAP_AUTH_KRBV4 ) || ( authmethod ==
+			LDAP_AUTH_KRBV41 ) ) {
+		if( version > LDAP_VERSION2 ) {
+			fprintf( stderr, "Kerberos requires LDAPv2\n" );
+			return( EXIT_FAILURE );
+		}
+		version = LDAP_VERSION2;
+	}
+	else if ( authmethod == LDAP_AUTH_SASL ) {
+		if( version != -1 && version != LDAP_VERSION3 ) {
+			fprintf( stderr, "SASL requires LDAPv3\n" );
+			return( EXIT_FAILURE );
+		}
+		version = LDAP_VERSION3;
+	}
+
+	if( manageDSAit ) {
+		if( version != -1 && version != LDAP_VERSION3 ) {
+			fprintf(stderr, "manage DSA control requires LDAPv3\n");
+			return EXIT_FAILURE;
+		}
+		version = LDAP_VERSION3;
+	}
+
+	if( use_tls ) {
+		if( version != -1 && version != LDAP_VERSION3 ) {
+			fprintf(stderr, "Start TLS requires LDAPv3\n");
+			return EXIT_FAILURE;
+		}
+		version = LDAP_VERSION3;
+	}
+
+    if (newSuperior != NULL) {
+		if (version == LDAP_VERSION2) {
+			fprintf( stderr,
+				"%s: version conflict!, -s newSuperior requires LDAPv3\n",
+				myname);
+			usage( argv[0] );
+			return( EXIT_FAILURE );
+		}
+		version = LDAP_VERSION3;
+    }
+    
     havedn = 0;
     if (argc - optind == 2) {
 	if (( rdn = strdup( argv[argc - 1] )) == NULL ) {
 	    perror( "strdup" );
-	    exit( 1 );
+	    return( EXIT_FAILURE );
 	}
         if (( entrydn = strdup( argv[argc - 2] )) == NULL ) {
 	    perror( "strdup" );
-	    exit( 1 );
+	    return( EXIT_FAILURE );
         }
 	++havedn;
     } else if ( argc - optind != 0 ) {
 	fprintf( stderr, "%s: invalid number of arguments, only two allowed\n", myname);
-	fprintf( stderr, usage, argv[0] );
-	exit( 1 );
+	usage( argv[0] );
+	return( EXIT_FAILURE );
     }
 
     if ( infile != NULL ) {
 	if (( fp = fopen( infile, "r" )) == NULL ) {
 	    perror( infile );
-	    exit( 1 );
+	    return( EXIT_FAILURE );
 	}
     } else {
 	fp = stdin;
     }
 
-    if (( ld = ldap_open( ldaphost, ldapport )) == NULL ) {
-	perror( "ldap_open" );
-	exit( 1 );
+	if ( debug ) {
+		if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
+			fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
+		}
+		if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
+			fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
+		}
+	}
+
+#ifdef SIGPIPE
+	(void) SIGNAL( SIGPIPE, SIG_IGN );
+#endif
+
+    if (( ld = ldap_init( ldaphost, ldapport )) == NULL ) {
+	perror( "ldap_init" );
+	return( EXIT_FAILURE );
     }
 
 	/* this seems prudent */
-	ldap_set_option( ld, LDAP_OPT_DEREF, LDAP_DEREF_NEVER);
+	{
+		int deref = LDAP_DEREF_NEVER;
+		ldap_set_option( ld, LDAP_OPT_DEREF, &deref);
+	}
+	/* don't chase referrals */
+	ldap_set_option( ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF );
 
-    if ( !kerberos ) {
-	authmethod = LDAP_AUTH_SIMPLE;
-    } else if ( kerberos == 1 ) {
-	authmethod = LDAP_AUTH_KRBV41;
-    } else {
-	authmethod = LDAP_AUTH_KRBV4;
-    }
-    if ( ldap_bind_s( ld, binddn, passwd, authmethod ) != LDAP_SUCCESS ) {
-	ldap_perror( ld, "ldap_bind" );
-	exit( 1 );
-    }
+
+	if (version != -1 &&
+		ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) != LDAP_OPT_SUCCESS)
+	{
+		fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
+	}
+
+	if ( use_tls && ldap_start_tls( ld, NULL, NULL ) != LDAP_SUCCESS ) {
+		if ( use_tls > 1 ) {
+			ldap_perror( ld, "ldap_start_tls" );
+			return( EXIT_FAILURE );
+		}
+	}
+
+	if (want_bindpw)
+		passwd.bv_val = getpassphrase("Enter LDAP Password: ");
+		passwd.bv_len = strlen( passwd.bv_val );
+
+	if ( authmethod == LDAP_AUTH_SASL ) {
+#ifdef HAVE_CYRUS_SASL
+		int	minssf = 0, maxssf = 0;
+
+		if ( sasl_integrity > 0 )
+			maxssf = 1;
+		if ( sasl_integrity > 1 )
+			minssf = 1;
+		if ( sasl_privacy > 0 )
+			maxssf = 100000; /* Something big value */
+		if ( sasl_privacy > 1 )
+			minssf = 56;
+		
+		if ( ldap_set_option( ld, LDAP_OPT_X_SASL_MINSSF,
+			(void *)&minssf ) != LDAP_OPT_SUCCESS ) {
+			fprintf( stderr, "Could not set LDAP_OPT_X_SASL_MINSSF"
+				"%d\n", minssf);
+			return( EXIT_FAILURE );
+		}
+		if ( ldap_set_option( ld, LDAP_OPT_X_SASL_MAXSSF,
+			(void *)&maxssf ) != LDAP_OPT_SUCCESS ) {
+			fprintf( stderr, "Could not set LDAP_OPT_X_SASL_MAXSSF"
+				"%d\n", maxssf);
+			return( EXIT_FAILURE );
+		}
+		
+		rc = ldap_negotiated_sasl_bind_s( ld, binddn, sasl_authc_id,
+				sasl_authz_id, sasl_mech,
+				passwd.bv_len ? &passwd : NULL,
+				NULL, NULL );
+
+		if( rc != LDAP_SUCCESS ) {
+			ldap_perror( ld, "ldap_negotiated_sasl_bind_s" );
+			return( EXIT_FAILURE );
+		}
+#else
+		fprintf( stderr, "%s was not compiled with SASL support\n",
+			argv[0] );
+		return( EXIT_FAILURE );
+#endif
+	}
+	else {
+		if ( ldap_bind_s( ld, binddn, passwd.bv_val, authmethod )
+				!= LDAP_SUCCESS ) {
+			ldap_perror( ld, "ldap_bind" );
+			return( EXIT_FAILURE );
+		}
+	}
+
+	if ( manageDSAit ) {
+		int err;
+		LDAPControl c;
+		LDAPControl *ctrls[2];
+		ctrls[0] = &c;
+		ctrls[1] = NULL;
+
+		c.ldctl_oid = LDAP_CONTROL_MANAGEDSAIT;
+		c.ldctl_value.bv_val = NULL;
+		c.ldctl_value.bv_len = 0;
+		c.ldctl_iscritical = manageDSAit > 1;
+
+		err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, &ctrls );
+
+		if( err != LDAP_OPT_SUCCESS ) {
+			fprintf( stderr, "Could not set Manage DSA IT Control\n" );
+			if( c.ldctl_iscritical ) {
+				exit( EXIT_FAILURE );
+			}
+		}
+	}
 
     rc = 0;
     if (havedn)
-	rc = domodrdn(ld, entrydn, rdn, remove);
+	rc = domodrdn( ld, entrydn, rdn, newSuperior, remove );
     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 */
@@ -155,14 +449,14 @@ main( argc, argv )
 	    if ( havedn ) {	/* have DN, get RDN */
 		if (( rdn = strdup( buf )) == NULL ) {
                     perror( "strdup" );
-                    exit( 1 );
+                    return( EXIT_FAILURE );
 		}
-		rc = domodrdn(ld, entrydn, rdn, remove);
+		rc = domodrdn(ld, entrydn, rdn, newSuperior, remove );
 		havedn = 0;
 	    } else if ( !havedn ) {	/* don't have DN yet */
 	        if (( entrydn = strdup( buf )) == NULL ) {
 		    perror( "strdup" );
-		    exit( 1 );
+		    return( EXIT_FAILURE );
 	        }
 		++havedn;
 	    }
@@ -171,32 +465,32 @@ main( argc, argv )
 
     ldap_unbind( ld );
 
-    exit( rc );
-
 	/* UNREACHABLE */
-	return(0);
+	return( rc );
 }
 
 static int domodrdn(
     LDAP	*ld,
     char	*dn,
     char	*rdn,
-    int		remove)	/* flag: remove old RDN */
+    char	*newSuperior,
+    int		remove ) /* flag: remove old RDN */
 {
     int	i;
 
     if ( verbose ) {
-	printf( "modrdn %s:\n\t%s\n", dn, rdn );
-	if (remove)
-	    printf("removing old RDN\n");
-	else
-	    printf("keeping old RDN\n");
-    }
+		printf( "Renaming \"%s\"\n", dn );
+		printf( "\tnew rdn=\"%s\" (%s old rdn)\n",
+			rdn, remove ? "delete" : "keep" );
+		if( newSuperior != NULL ) {
+			printf("\tnew parent=\"%s\"\n", newSuperior);
+		}
+	}
 
     if ( !not ) {
-	i = ldap_modrdn2_s( ld, dn, rdn, remove );
+	i = ldap_rename2_s( ld, dn, rdn, newSuperior, remove );
 	if ( i != LDAP_SUCCESS ) {
-	    ldap_perror( ld, "ldap_modrdn2_s" );
+	    ldap_perror( ld, "ldap_rename2_s" );
 	} else if ( verbose ) {
 	    printf( "modrdn complete\n" );
 	}