X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodrdn.c;h=60889b7a543cbe6a4b70f9363233a9e7925c42e5;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=45431bad5220840b7da0056ad1fc6386b0a8617e;hpb=2f3399265caf72d81ba192a86d63a7a96b0c837b;p=openldap

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 45431bad52..60889b7a54 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -49,8 +49,13 @@ do_modrdn(
 	struct berval newSuperior = { 0, NULL };
 	ber_int_t	deloldrdn;
 
-	char	*ndn = NULL;
-	char	*nnewSuperior = NULL;
+	struct berval pdn = { 0, NULL };
+	struct berval pnewrdn = { 0, NULL };
+	struct berval pnewSuperior = { 0, NULL }, *pnewS = NULL;
+
+	struct berval ndn = { 0, NULL };
+	struct berval nnewrdn = { 0, NULL };
+	struct berval nnewSuperior = { 0, NULL }, *nnewS = NULL;
 
 	Backend	*be;
 	Backend	*newSuperior_be = NULL;
@@ -78,7 +83,7 @@ do_modrdn(
 	 *	}
 	 */
 
-	if ( ber_scanf( op->o_ber, "{oob", &dn, &newrdn, &deloldrdn )
+	if ( ber_scanf( op->o_ber, "{mmb", &dn, &newrdn, &deloldrdn )
 	    == LBER_ERROR )
 	{
 #ifdef NEW_LOGGING
@@ -115,14 +120,14 @@ do_modrdn(
 			goto cleanup;
 		}
 
-		if ( ber_scanf( op->o_ber, "o", &newSuperior ) 
+		if ( ber_scanf( op->o_ber, "m", &newSuperior ) 
 		     == LBER_ERROR ) {
 
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				"do_modrdn: ber_scanf(\"a\") failed\n" ));
+				"do_modrdn: ber_scanf(\"m\") failed\n" ));
 #else
-			Debug( LDAP_DEBUG_ANY, "ber_scanf(\"a\") failed\n",
+			Debug( LDAP_DEBUG_ANY, "ber_scanf(\"m\") failed\n",
 				0, 0, 0 );
 #endif
 
@@ -131,24 +136,8 @@ do_modrdn(
 			rc = SLAPD_DISCONNECT;
 			goto cleanup;
 		}
-
-		nnewSuperior = ch_strdup( newSuperior.bv_val );
-
-		if( dn_normalize( nnewSuperior ) == NULL ) {
-#ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				"do_modrdn:  invalid new superior (%s)\n",
-				newSuperior.bv_val ));
-#else
-			Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid new superior (%s)\n",
-				newSuperior.bv_val, 0, 0 );
-#endif
-
-			send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
-				"invalid new superior DN", NULL, NULL );
-			goto cleanup;
-		}
-
+		pnewS = &pnewSuperior;
+		nnewS = &nnewSuperior;
 	}
 
 #ifdef NEW_LOGGING
@@ -163,7 +152,6 @@ do_modrdn(
 		newSuperior.bv_len ? newSuperior.bv_val : "" );
 #endif
 
-
 	if ( ber_scanf( op->o_ber, /*{*/ "}") == LBER_ERROR ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
@@ -190,37 +178,22 @@ do_modrdn(
 		goto cleanup;
 	} 
 
-	ndn = ch_strdup( dn.bv_val );
-
-	if( dn_normalize( ndn ) == NULL ) {
+	rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
+	if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			"do_modrdn: invalid dn (%s)\n", dn.bv_val ));
+		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+			"do_modrdn: conn %d  invalid dn (%s)\n",
+			conn->c_connid, dn.bv_val ));
 #else
-		Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid dn (%s)\n",
-			dn.bv_val, 0, 0 );
+		Debug( LDAP_DEBUG_ANY,
+			"do_modrdn: invalid dn (%s)\n", dn.bv_val, 0, 0 );
 #endif
-
 		send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
 		    "invalid DN", NULL, NULL );
 		goto cleanup;
 	}
 
-	if( !rdn_validate( newrdn.bv_val ) ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			"do_modrdn: invalid rdn (%s).\n", newrdn.bv_val ));
-#else
-		Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n",
-			newrdn.bv_val, 0, 0 );
-#endif
-
-		send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
-		    "invalid RDN", NULL, NULL );
-		goto cleanup;
-	}
-
-	if( *ndn == '\0' ) {
+	if( ndn.bv_len == 0 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
 			   "do_modrdn:  attempt to modify root DSE.\n" ));
@@ -233,7 +206,7 @@ do_modrdn(
 		goto cleanup;
 
 #ifdef SLAPD_SCHEMA_DN
-	} else if ( strcasecmp( ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+	} else if ( strcasecmp( ndn.bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
 			"do_modrdn: attempt to modify subschema subentry\n" ));
@@ -247,8 +220,58 @@ do_modrdn(
 #endif
 	}
 
+	/* FIXME: should have/use rdnPretty / rdnNormalize routines */
+
+	rc = dnPrettyNormal( NULL, &newrdn, &pnewrdn, &nnewrdn );
+	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+			"do_modrdn: conn %d  invalid newrdn (%s)\n",
+			conn->c_connid, newrdn.bv_val ));
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"do_modrdn: invalid newrdn (%s)\n", newrdn.bv_val, 0, 0 );
+#endif
+		send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+		    "invalid new RDN", NULL, NULL );
+		goto cleanup;
+	}
+
+	if( rdnValidate( &pnewrdn ) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+			"do_modrdn: invalid rdn (%s).\n", pnewrdn.bv_val ));
+#else
+		Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n",
+			pnewrdn.bv_val, 0, 0 );
+#endif
+
+		send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+		    "invalid new RDN", NULL, NULL );
+		goto cleanup;
+	}
+
+	if( pnewS ) {
+		rc = dnPrettyNormal( NULL, &newSuperior, &pnewSuperior,
+			&nnewSuperior );
+		if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+				"do_modrdn: conn %d  invalid newSuperior (%s)\n",
+				conn->c_connid, newSuperior.bv_val ));
+#else
+			Debug( LDAP_DEBUG_ANY,
+				"do_modrdn: invalid newSuperior (%s)\n",
+				newSuperior.bv_val, 0, 0 );
+#endif
+			send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+				"invalid newSuperior", NULL, NULL );
+			goto cleanup;
+		}
+	}
+
 	Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MODRDN dn=\"%s\"\n",
-	    op->o_connid, op->o_opid, dn.bv_val, 0, 0 );
+	    op->o_connid, op->o_opid, pdn.bv_val, 0, 0 );
 
 	manageDSAit = get_manageDSAit( op );
 
@@ -257,14 +280,14 @@ do_modrdn(
 	 * appropriate one, or send a referral to our "referral server"
 	 * if we don't hold it.
 	 */
-	if ( (be = select_backend( ndn, manageDSAit, 0 )) == NULL ) {
-		struct berval **ref = referral_rewrite( default_referral,
-			NULL, dn.bv_val, LDAP_SCOPE_DEFAULT );
+	if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
+		BVarray ref = referral_rewrite( default_referral,
+			NULL, &pdn, LDAP_SCOPE_DEFAULT );
 
 		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
 			NULL, NULL, ref ? ref : default_referral, NULL );
 
-		ber_bvecfree( ref );
+		bvarray_free( ref );
 		goto cleanup;
 	}
 
@@ -277,7 +300,7 @@ do_modrdn(
 	}
 
 	/* check for referrals */
-	rc = backend_check_referrals( be, conn, op, dn.bv_val, ndn );
+	rc = backend_check_referrals( be, conn, op, &pdn, &ndn );
 	if ( rc != LDAP_SUCCESS ) {
 		goto cleanup;
 	}
@@ -285,8 +308,8 @@ do_modrdn(
 	/* Make sure that the entry being changed and the newSuperior are in 
 	 * the same backend, otherwise we return an error.
 	 */
-	if( newSuperior.bv_len ) {
-		newSuperior_be = select_backend( nnewSuperior, 0, 0 );
+	if( pnewS ) {
+		newSuperior_be = select_backend( &nnewSuperior, 0, 0 );
 
 		if ( newSuperior_be != be ) {
 			/* newSuperior is in same backend */
@@ -299,11 +322,11 @@ do_modrdn(
 		}
 
 		/* deref suffix alias if appropriate */
-		nnewSuperior = suffix_alias( be, nnewSuperior );
+		suffix_alias( be, &nnewSuperior );
 	}
 
 	/* deref suffix alias if appropriate */
-	ndn = suffix_alias( be, ndn );
+	suffix_alias( be, &ndn );
 
 	/*
 	 * do the add if 1 && (2 || 3)
@@ -313,35 +336,36 @@ do_modrdn(
 	 */
 	if ( be->be_modrdn ) {
 		/* do the update here */
-		int repl_user = be_isupdate( be, op->o_ndn.bv_val );
+		int repl_user = be_isupdate( be, &op->o_ndn );
 #ifndef SLAPD_MULTIMASTER
-		if ( be->be_update_ndn == NULL || repl_user )
+		if ( !be->be_update_ndn.bv_len || repl_user )
 #endif
 		{
-			if ( (*be->be_modrdn)( be, conn, op, dn.bv_val, ndn,
-				newrdn.bv_val, deloldrdn, newSuperior.bv_val ) == 0
+			if ( (*be->be_modrdn)( be, conn, op, &pdn, &ndn,
+				&pnewrdn, &nnewrdn, deloldrdn,
+				pnewS, nnewS ) == 0
 #ifdef SLAPD_MULTIMASTER
-				&& ( be->be_update_ndn == NULL || !repl_user )
+				&& ( !be->be_update_ndn.bv_len || !repl_user )
 #endif
 			) {
-				struct replog_moddn moddn;
-				moddn.newrdn = newrdn.bv_val;
+				struct slap_replog_moddn moddn;
+				moddn.newrdn = &pnewrdn;
 				moddn.deloldrdn = deloldrdn;
-				moddn.newsup = newSuperior.bv_val;
+				moddn.newsup = &pnewSuperior;
 
-				replog( be, op, dn.bv_val, ndn, &moddn );
+				replog( be, op, &pdn, &ndn, &moddn );
 			}
 #ifndef SLAPD_MULTIMASTER
 		} else {
-			struct berval **defref = be->be_update_refs
+			BVarray defref = be->be_update_refs
 				? be->be_update_refs : default_referral;
-			struct berval **ref = referral_rewrite( defref,
-				NULL, dn.bv_val, LDAP_SCOPE_DEFAULT );
+			BVarray ref = referral_rewrite( defref,
+				NULL, &pdn, LDAP_SCOPE_DEFAULT );
 
 			send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
 				ref ? ref : defref, NULL );
 
-			ber_bvecfree( ref );
+			bvarray_free( ref );
 #endif
 		}
 	} else {
@@ -351,11 +375,14 @@ do_modrdn(
 	}
 
 cleanup:
-	free( dn.bv_val );
-	free( newrdn.bv_val );	
-	free( newSuperior.bv_val );
+	free( pdn.bv_val );
+	free( ndn.bv_val );
+
+	free( pnewrdn.bv_val );	
+	free( nnewrdn.bv_val );	
+
+	if ( pnewSuperior.bv_val ) free( pnewSuperior.bv_val );
+	if ( nnewSuperior.bv_val ) free( nnewSuperior.bv_val );
 
-	if( ndn != NULL ) free( ndn );
-	if ( nnewSuperior != NULL ) free( nnewSuperior );
 	return rc;
 }