Fixup bdb_entry_release now that entry_decode uses two memory blocks

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index e102698c67b9d2259ecd82ef48ae06f16d2f92dd..5d10e369d7a00c04fcb7ecfb8d5a8b3a50a53df2 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -38,8 +38,8 @@ do_delete(
        int manageDSAit;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "do_delete: conn %d\n", conn->c_connid ));
+       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
@@ -52,8 +52,8 @@ 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 ));
+               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
@@ -64,8 +64,8 @@ do_delete(
 
        if( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "oepration", LDAP_LEVEL_ERR,
-                       "do_delete: conn %d  get_ctrls failed\n", conn->c_connid ));
+               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
@@ -76,8 +76,8 @@ do_delete(
 
        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 ));
+               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
@@ -86,10 +86,10 @@ do_delete(
                goto cleanup;
        }
 
-       if( ndn == '\0' ) {
+       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 ));
+               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
@@ -97,6 +97,21 @@ do_delete(
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
                        NULL, "cannot delete the root DSE", NULL, NULL );
                goto cleanup;
+
+#ifdef SLAPD_SCHEMA_DN
+       } else if ( strcasecmp( ndn, 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 ));
+#else
+               Debug( LDAP_DEBUG_ANY, "do_delete: subschema subentry!\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;
+
+#endif
        }
 
        Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d DEL dn=\"%s\"\n",
@@ -110,8 +125,13 @@ do_delete(
         * if we don't hold it.
         */
        if ( (be = select_backend( ndn, manageDSAit )) == NULL ) {
+               struct berval **ref = referral_rewrite( default_referral,
+                       NULL, dn, LDAP_SCOPE_DEFAULT );
+
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                       NULL, NULL, default_referral, NULL );
+                       NULL, NULL, ref ? ref : default_referral, NULL );
+
+               ber_bvecfree( ref );
                goto cleanup;
        }
 
@@ -141,14 +161,13 @@ do_delete(
        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 )
+               int repl_user = be_isupdate( be, op->o_ndn );
+               if ( be->be_update_ndn == NULL || repl_user )
 #endif
                {
                        if ( (*be->be_delete)( be, conn, op, dn, ndn ) == 0 ) {
 #ifdef SLAPD_MULTIMASTER
-                               if (be->be_update_ndn == NULL ||
-                                       strcmp( be->be_update_ndn, op->o_ndn ))
+                               if (be->be_update_ndn == NULL || !repl_user )
 #endif
                                {
                                        replog( be, op, dn, NULL );
@@ -156,8 +175,15 @@ do_delete(
                        }
 #ifndef SLAPD_MULTIMASTER
                } else {
+                       struct berval **defref = be->be_update_refs
+                               ? be->be_update_refs : default_referral;
+                       struct berval **ref = referral_rewrite( default_referral,
+                               NULL, dn, LDAP_SCOPE_DEFAULT );
+
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
-                               be->be_update_refs ? be->be_update_refs : default_referral, NULL );
+                               ref ? ref : defref, NULL );
+
+                       ber_bvecfree( ref );
 #endif
                }