X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdelete.c;h=03d9c16ab58578b981b92ab38258d2bf8be76e4d;hb=740f1b422edc48c9eeed8346c45872a63b683370;hp=66f68d9d89bbf96f0ca0b05d728a4f28ea470f3b;hpb=0503205c9343b3fb3231baa74718cd484f5bffec;p=openldap

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 66f68d9d89..03d9c16ab5 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
@@ -19,7 +23,7 @@
 
 #include "slap.h"
 
-void
+int
 do_delete(
     Connection	*conn,
     Operation	*op
@@ -27,9 +31,18 @@ do_delete(
 {
 	char	*ndn;
 	Backend	*be;
+	int rc;
 
 	Debug( LDAP_DEBUG_TRACE, "do_delete\n", 0, 0, 0 );
 
+	if( op->o_bind_in_progress ) {
+		Debug( LDAP_DEBUG_ANY, "do_delete: SASL bind in progress.\n",
+			0, 0, 0 );
+		send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS,
+			NULL, "SASL bind in progress", NULL, NULL );
+		return LDAP_SASL_BIND_IN_PROGRESS;
+	}
+
 	/*
 	 * Parse the delete request.  It looks like this:
 	 *
@@ -38,14 +51,26 @@ do_delete(
 
 	if ( ber_scanf( op->o_ber, "a", &ndn ) == LBER_ERROR ) {
 		Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, "" );
-		return;
+		send_ldap_disconnect( conn, op,
+			LDAP_PROTOCOL_ERROR, "decoding error" );
+		return -1;
 	}
 
-	Debug( LDAP_DEBUG_ARGS, "do_delete: dn (%s)\n", ndn, 0, 0 );
+	if(	dn_normalize_case( ndn ) == NULL ) {
+		Debug( LDAP_DEBUG_ANY, "do_delete: invalid dn (%s)\n", ndn, 0, 0 );
+		send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+		    "invalid DN", NULL, NULL );
+		free( ndn );
+		return rc;
+	}
 
-	dn_normalize_case( ndn );
+	if( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) {
+		free( ndn );
+		Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
+		return rc;
+	} 
 
+	Debug( LDAP_DEBUG_ARGS, "do_delete: dn (%s)\n", ndn, 0, 0 );
 	Debug( LDAP_DEBUG_STATS, "DEL dn=\"%s\"\n", ndn, 0, 0 );
 
 	/*
@@ -54,14 +79,14 @@ do_delete(
 	 * if we don't hold it.
 	 */
 	if ( (be = select_backend( ndn )) == NULL ) {
+		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+			NULL, NULL, default_referral, NULL );
 		free( ndn );
-		send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
-		    default_referral );
-		return;
+		return rc;
 	}
 
-	/* alias suffix if approp */
-	ndn = suffixAlias( ndn, op, be );
+	/* deref suffix alias if appropriate */
+	ndn = suffix_alias( be, ndn );
 
 	/*
 	 * do the delete if 1 && (2 || 3)
@@ -69,22 +94,34 @@ do_delete(
 	 * 2) this backend is master for what it holds;
 	 * 3) it's a replica and the dn supplied is the update_ndn.
 	 */
-	if ( be->be_delete != NULL ) {
+	if ( be->be_delete ) {
 		/* do the update here */
+#ifndef SLAPD_MULTIMASTER
 		if ( be->be_update_ndn == NULL ||
 			strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+#endif
 		{
 			if ( (*be->be_delete)( be, conn, op, ndn ) == 0 ) {
-				replog( be, LDAP_REQ_DELETE, ndn, NULL, 0 );
+#ifdef SLAPD_MULTIMASTER
+				if (be->be_update_ndn == NULL ||
+					strcmp( be->be_update_ndn, op->o_ndn ))
+#endif
+				{
+					replog( be, op, ndn, NULL );
+				}
 			}
+#ifndef SLAPD_MULTIMASTER
 		} else {
-			send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
-			    default_referral );
+			send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
+				be->be_update_refs ? be->be_update_refs : default_referral, NULL );
+#endif
 		}
+
 	} else {
-		send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-		    "Function not implemented" );
+		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+			NULL, "Function not implemented", NULL, NULL );
 	}
 
 	free( ndn );
+	return rc;
 }