X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdelete.c;h=362f1b915a3fe5f1dd343a15dbed6f07675c452a;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=2eeb56daacaf548d324511fba3af5abdfd954590;hpb=3336619c800cb12b9553f68b58179ea1def802ff;p=openldap

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 2eeb56daac..362f1b915a 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.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
  */
 /*
@@ -32,8 +32,8 @@ do_delete(
 )
 {
 	struct berval dn = { 0, NULL };
-	struct berval *ndn = NULL;
-	struct berval *pdn = NULL;
+	struct berval pdn = { 0, NULL };
+	struct berval ndn = { 0, NULL };
 	const char *text;
 	Backend	*be;
 	int rc;
@@ -52,7 +52,7 @@ do_delete(
 	 *	DelRequest := DistinguishedName
 	 */
 
-	if ( ber_scanf( op->o_ber, "o", &dn ) == LBER_ERROR ) {
+	if ( ber_scanf( op->o_ber, "m", &dn ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
 			"do_delete: conn: %d  ber_scanf failed\n", conn->c_connid ));
@@ -74,7 +74,7 @@ do_delete(
 		goto cleanup;
 	} 
 
-	rc = dnPretty( NULL, &dn, &pdn );
+	rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
 	if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
@@ -89,22 +89,7 @@ do_delete(
 		goto cleanup;
 	}
 
-	rc = dnNormalize( NULL, &dn, &ndn );
-	if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-			"do_delete: conn %d  invalid dn (%s)\n",
-			conn->c_connid, dn.bv_val ));
-#else
-		Debug( LDAP_DEBUG_ANY,
-			"do_delete: 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( ndn->bv_len == 0 ) {
+	if( ndn.bv_len == 0 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_delete: conn %d: "
 			"Attempt to delete root DSE.\n", conn->c_connid ));
@@ -118,7 +103,7 @@ do_delete(
 
 #ifdef SLAPD_SCHEMA_DN
 
-	} else if ( strcasecmp( ndn->bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
+	} else if ( strcasecmp( ndn.bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_delete: conn %d: "
 			"Attempt to delete subschema subentry.\n", conn->c_connid ));
@@ -134,7 +119,7 @@ do_delete(
 	}
 
 	Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d DEL dn=\"%s\"\n",
-		op->o_connid, op->o_opid, pdn->bv_val, 0, 0 );
+		op->o_connid, op->o_opid, pdn.bv_val, 0, 0 );
 
 	manageDSAit = get_manageDSAit( op );
 
@@ -143,14 +128,14 @@ do_delete(
 	 * 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, pdn->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;
 	}
 
@@ -163,13 +148,13 @@ do_delete(
 	}
 
 	/* check for referrals */
-	rc = backend_check_referrals( be, conn, op, pdn->bv_val, ndn->bv_val );
+	rc = backend_check_referrals( be, conn, op, &pdn, &ndn );
 	if ( rc != LDAP_SUCCESS ) {
 		goto cleanup;
 	}
 
 	/* deref suffix alias if appropriate */
-	suffix_alias( be, ndn );
+	suffix_alias( be, &ndn );
 
 	/*
 	 * do the delete if 1 && (2 || 3)
@@ -184,25 +169,25 @@ do_delete(
 		if ( !be->be_update_ndn.bv_len || repl_user )
 #endif
 		{
-			if ( (*be->be_delete)( be, conn, op, pdn->bv_val, ndn->bv_val ) == 0 ) {
+			if ( (*be->be_delete)( be, conn, op, &pdn, &ndn ) == 0 ) {
 #ifdef SLAPD_MULTIMASTER
 				if ( !be->be_update_ndn.bv_len || !repl_user )
 #endif
 				{
-					replog( be, op, pdn->bv_val, ndn->bv_val, NULL );
+					replog( be, op, &pdn, &ndn, NULL );
 				}
 			}
 #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( default_referral,
-				NULL, pdn->bv_val, LDAP_SCOPE_DEFAULT );
+			BVarray ref = referral_rewrite( default_referral,
+				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
 		}
 
@@ -212,8 +197,7 @@ do_delete(
 	}
 
 cleanup:
-	free( dn.bv_val );
-	if( pdn != NULL ) ber_bvfree( pdn );
-	if( ndn != NULL ) ber_bvfree( ndn );
+	free( pdn.bv_val );
+	free( ndn.bv_val );
 	return rc;
 }