(re)introduce o_connid such that STATS doesn't need c_mutex (which it

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 477e6f35f157935efd0f7140036570bf504ff341..2b2d41cfaaad047528eb7a394ff88d42d1b86cf6 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -19,78 +19,86 @@
 
 #include "slap.h"
 
-extern Backend *select_backend();
-extern char     *suffixAlias();
-
-extern char    *default_referral;
-
-void
+int
 do_delete(
     Connection *conn,
     Operation  *op
 )
 {
-       char    *dn, *odn;
+       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:
         *
         *      DelRequest := DistinguishedName
         */
 
-       if ( ber_scanf( op->o_ber, "a", &dn ) == LBER_ERROR ) {
+       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;
        }
-       odn = strdup( dn );
-       dn_normalize( dn );
 
-       Debug( LDAP_DEBUG_ARGS, "do_delete: dn (%s)\n", dn, 0, 0 );
+       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_STATS, "DEL dn=\"%s\"\n", dn, 0, 0 );
+       Debug( LDAP_DEBUG_ARGS, "do_delete: dn (%s)\n", ndn, 0, 0 );
+
+       dn_normalize_case( ndn );
+
+       Debug( LDAP_DEBUG_STATS, "DEL dn=\"%s\"\n", ndn, 0, 0 );
 
        /*
         * We could be serving multiple database backends.  Select the
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
-       if ( (be = select_backend( dn )) == NULL ) {
-               free( dn );
-               free( odn );
-               send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
-                   default_referral );
-               return;
+       if ( (be = select_backend( ndn )) == NULL ) {
+               free( ndn );
+               send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+                       NULL, NULL, default_referral, NULL );
+               return rc;
        }
 
-        /* alias suffix if approp */
-        dn = suffixAlias ( dn, op, be );
-
        /*
         * do the delete if 1 && (2 || 3)
         * 1) there is a delete function implemented in this backend;
         * 2) this backend is master for what it holds;
-        * 3) it's a replica and the dn supplied is the updatedn.
+        * 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 */
-               if ( be->be_updatedn == NULL || strcasecmp( be->be_updatedn,
-                   op->o_dn ) == 0 ) {
-                       if ( (*be->be_delete)( be, conn, op, dn ) == 0 ) {
-                               replog( be, LDAP_REQ_DELETE, odn, NULL, 0 );
+               if ( be->be_update_ndn == NULL ||
+                       strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+               {
+                       if ( (*be->be_delete)( be, conn, op, ndn ) == 0 ) {
+                               replog( be, LDAP_REQ_DELETE, ndn, NULL, 0 );
                        }
                } 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 );
                }
        } 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( dn );
-       free( odn );
+       free( ndn );
+       return rc;
 }