More changes to let BDB build without LDBM.

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index b63367214ad1726b40b62f433669ede3ea01dcc3..b1bf15eb8a0ff95e982da15a14b7214e579cecd7 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -31,11 +31,18 @@ do_delete(
     Operation  *op
 )
 {
-       char    *dn, *ndn;
+       char *dn, *ndn = NULL;
+       const char *text;
        Backend *be;
        int rc;
+       int manageDSAit;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "do_delete: conn %d\n", conn->c_connid ));
+#else
        Debug( LDAP_DEBUG_TRACE, "do_delete\n", 0, 0, 0 );
+#endif
 
        /*
         * Parse the delete request.  It looks like this:
@@ -44,55 +51,81 @@ do_delete(
         */
 
        if ( ber_scanf( op->o_ber, "a", &dn ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "do_delete: conn: %d  ber_scanf failed\n", conn->c_connid ));
+#else
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
+#endif
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
                return SLAPD_DISCONNECT;
        }
 
        if( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) {
-               Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "oepration", LDAP_LEVEL_ERR,
+                          "do_delete: conn %d  get_ctrls failed\n", conn->c_connid ));
+#else
+               Debug( LDAP_DEBUG_ANY, "do_delete: get_ctrls failed\n", 0, 0, 0 );
+#endif
                goto cleanup;
        } 
 
        ndn = ch_strdup( dn );
 
        if(     dn_normalize( ndn ) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "do_delete: conn %d  invalid dn (%s).\n", conn->c_connid, dn ));
+#else
                Debug( LDAP_DEBUG_ANY, "do_delete: invalid dn (%s)\n", dn, 0, 0 );
+#endif
                send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
                    "invalid DN", NULL, NULL );
                goto cleanup;
        }
 
+       if( *ndn == '\0' ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_delete: conn %d  Attempt to delete root DSE.\n", conn->c_connid ));
+#else
+               Debug( LDAP_DEBUG_ANY, "do_delete: root dse!\n", 0, 0, 0 );
+#endif
+               /* protocolError would likely be a more appropriate error */
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "cannot delete the root DSE", NULL, NULL );
+               goto cleanup;
+       }
+
        Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d DEL dn=\"%s\"\n",
                op->o_connid, op->o_opid, dn, 0, 0 );
 
+       manageDSAit = get_manageDSAit( op );
+
        /*
         * 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( ndn )) == NULL ) {
+       if ( (be = select_backend( ndn, manageDSAit )) == NULL ) {
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        NULL, NULL, default_referral, NULL );
                goto cleanup;
        }
 
-       /* make sure this backend recongizes critical controls */
-       rc = backend_check_controls( be, conn, op ) ;
-
+       /* check restrictions */
+       rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
-                       NULL, NULL, NULL, NULL );
+                       NULL, text, NULL, NULL );
                goto cleanup;
        }
 
-       if ( global_readonly || be->be_readonly ) {
-               Debug( LDAP_DEBUG_ANY, "do_delete: database is read-only\n",
-                      0, 0, 0 );
-               send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-                                 NULL, "database is read-only", NULL, NULL );
-               rc = LDAP_UNWILLING_TO_PERFORM;
+       /* check for referrals */
+       rc = backend_check_referrals( be, conn, op, dn, ndn );
+       if ( rc != LDAP_SUCCESS ) {
                goto cleanup;
        }
 
@@ -130,10 +163,10 @@ do_delete(
 
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "Function not implemented", NULL, NULL );
+                       NULL, "operation not supported within namingContext", NULL, NULL );
        }
 cleanup:
-       free( ndn );
+       if( ndn != NULL ) free( ndn );
        free( dn );
        return rc;
 }