X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fdelete.c;h=63d87a434da8d4fa59058a78fb2b56bf14b8a1e9;hb=426ca14a868b6edb638b48e14593542a365fcc4b;hp=4c22ac89e2b73aeeabf9658f51473872e0fe3486;hpb=0b4c7e0181497ad06dbb2e64ba3930cfe7f9c15e;p=openldap

diff --git a/servers/slapd/back-meta/delete.c b/servers/slapd/back-meta/delete.c
index 4c22ac89e2..63d87a434d 100644
--- a/servers/slapd/back-meta/delete.c
+++ b/servers/slapd/back-meta/delete.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  *
  * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
@@ -76,62 +76,47 @@
 #include "back-meta.h"
 
 int
-meta_back_delete(
-		Backend		*be,
-		Connection	*conn,
-		Operation	*op,
-		const char	*dn,
-		const char	*ndn
-)
+meta_back_delete( Operation *op, SlapReply *rs )
 {
-	struct metainfo *li = ( struct metainfo * )be->be_private;
+	struct metainfo *li = ( struct metainfo * )op->o_bd->be_private;
 	struct metaconn *lc;
 	int candidate = -1;
+	struct berval mdn = { 0, NULL };
+	dncookie dc;
 
-	char *mdn = NULL;
-
-	lc = meta_back_getconn( li, conn, op, META_OP_REQUIRE_SINGLE,
-			ndn, &candidate );
-	if ( !lc || !meta_back_dobind( lc, op ) ) {
+	lc = meta_back_getconn( op, rs, META_OP_REQUIRE_SINGLE,
+			&op->o_req_ndn, &candidate );
+	if ( !lc ) {
+ 		send_ldap_result( op, rs );
+		return -1;
+	}
+	
+	if ( !meta_back_dobind( lc, op )
+			|| !meta_back_is_valid( lc, candidate ) ) {
+		rs->sr_err = LDAP_OTHER;
+ 		send_ldap_result( op, rs );
 		return -1;
 	}
 
 	/*
 	 * Rewrite the compare dn, if needed
 	 */
-	switch ( rewrite_session( li->targets[ candidate ]->rwinfo,
-				"deleteDn", dn, conn, &mdn ) ) {
-	case REWRITE_REGEXEC_OK:
-		if ( mdn == NULL ) {
-			mdn = ( char * )dn;
-		}
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-				"[rw] deleteDn: \"%s\" -> \"%s\"\n",
-				dn, mdn ));
-#else /* !NEW_LOGGING */
-		Debug( LDAP_DEBUG_ARGS, "rw> deleteDn: \"%s\" -> \"%s\"\n%s",
-				dn, mdn, "" );
-#endif /* !NEW_LOGGING */
-		break;
-		
-	case REWRITE_REGEXEC_UNWILLING:
-		send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-				NULL, "Unwilling to perform", NULL, NULL );
-		return -1;
+	dc.rwmap = &li->targets[ candidate ]->rwmap;
+	dc.conn = op->o_conn;
+	dc.rs = rs;
+	dc.ctx = "deleteDn";
 
-	case REWRITE_REGEXEC_ERR:
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-				NULL, "Operations error", NULL, NULL );
+	if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+		send_ldap_result( op, rs );
 		return -1;
 	}
-	
-	ldap_delete_s( lc->conns[ candidate ]->ld, mdn );
 
-	if ( mdn != dn ) {
-		free( mdn );
+	ldap_delete_s( lc->conns[ candidate ].ld, mdn.bv_val );
+
+	if ( mdn.bv_val != op->o_req_dn.bv_val ) {
+		free( mdn.bv_val );
 	}
 	
-	return meta_back_op_result( lc, op );
+	return meta_back_op_result( lc, op, rs );
 }