Remove abandon cruft

[openldap] / servers / slapd / back-ldbm / delete.c

diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index c6e9a6c501fc4e76e68a83619b6ff964033364cf..d1a53967bce98d09dd8db6afc042c5c5957c21ce 100644 (file)
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -21,8 +21,8 @@ ldbm_back_delete(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    const char *dn,
-    const char *ndn
+    struct berval      *dn,
+    struct berval      *ndn
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
@@ -36,29 +36,28 @@ ldbm_back_delete(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-               "ldbm_back_delete: %s\n", dn ));
+               "ldbm_back_delete: %s\n", dn->bv_val ));
 #else
-       Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn, 0, 0);
+       Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn->bv_val, 0, 0);
 #endif
 
        /* get entry with writer lock */
-       if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
+       if ( (e = dn2entry_w( be, ndn->bv_val, &matched )) == NULL ) {
                char *matched_dn = NULL;
                struct berval **refs;
 
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "ldbm_back_delete: no such object %s\n", dn ));
+                       "ldbm_back_delete: no such object %s\n", dn->bv_val ));
 #else
                Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: no such object %s\n",
-                       dn, 0, 0);
+                       dn->bv_val, 0, 0);
 #endif
 
                if ( matched != NULL ) {
                        matched_dn = ch_strdup( matched->e_dn );
                        refs = is_entry_referral( matched )
-                               ? get_entry_referrals( be, conn, op, matched,
-                                       dn, LDAP_SCOPE_DEFAULT )
+                               ? get_entry_referrals( be, conn, op, matched )
                                : NULL;
                        cache_return_entry_r( &li->li_cache, matched );
 
@@ -80,18 +79,17 @@ ldbm_back_delete(
                /* parent is a referral, don't allow add */
                /* parent is an alias, don't allow add */
                struct berval **refs = get_entry_referrals( be,
-                       conn, op, e, dn, LDAP_SCOPE_DEFAULT );
+                       conn, op, e );
 
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                          "ldbm_back_delete: entry (%s) is a referral.\n",
-                          e->e_dn ));
+                       "ldbm_back_delete: entry (%s) is a referral.\n",
+                       e->e_dn ));
 #else
                Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
                    0, 0 );
 #endif
 
-
                send_ldap_result( conn, op, LDAP_REFERRAL,
                    e->e_dn, NULL, refs, NULL );
 
@@ -121,7 +119,7 @@ ldbm_back_delete(
                if( (p = dn2entry_w( be, pdn, NULL )) == NULL) {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                                  "ldbm_back_delete: parent of (%s) does not exist\n", dn ));
+                               "ldbm_back_delete: parent of (%s) does not exist\n", dn ));
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "<=- ldbm_back_delete: parent does not exist\n",
@@ -139,7 +137,8 @@ ldbm_back_delete(
                {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                                  "ldbm_back_delete: no access to parent of (%s)\n", dn ));
+                               "ldbm_back_delete: no access to parent of (%s)\n",
+                               dn->bv_val ));
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "<=- ldbm_back_delete: no access to parent\n", 0,
@@ -153,14 +152,12 @@ ldbm_back_delete(
 
        } else {
                /* no parent, must be root to delete */
-               if( ! be_isroot( be, op->o_ndn ) ) {
-                       if ( be_issuffix( be, "" ) 
-                                       || be_isupdate( be, op->o_ndn ) ) {
-                               static const Entry rootp = { NOID, "", "", NULL, NULL };
-                               p = (Entry *)&rootp;
+               if( ! be_isroot( be, &op->o_ndn ) ) {
+                       if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) {
+                               p = (Entry *)&slap_entry_root;
                                
                                rc = access_allowed( be, conn, op, p,
-                                               children, NULL, ACL_WRITE );
+                                       children, NULL, ACL_WRITE );
                                p = NULL;
                                                                
                                /* check parent for "children" acl */
@@ -184,8 +181,8 @@ ldbm_back_delete(
                        } else {
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                                          "ldbm_back_delete: (%s) has no "
-                                          "parent & not a root.\n", dn ));
+                                       "ldbm_back_delete: (%s) has no "
+                                       "parent & not a root.\n", dn ));
 #else
                                Debug( LDAP_DEBUG_TRACE,
                                        "<=- ldbm_back_delete: no parent & "
@@ -207,11 +204,12 @@ ldbm_back_delete(
        if ( dn2id_delete( be, e->e_ndn, e->e_id ) != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "ldbm_back_delete: (%s) operations error\n", dn ));
+                       "ldbm_back_delete: (%s) operations error\n",
+                       dn->bv_val ));
 #else
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_back_delete: operations error %s\n",
-                       dn, 0, 0);
+                       dn->bv_val, 0, 0);
 #endif
 
                send_ldap_result( conn, op, LDAP_OTHER,
@@ -223,12 +221,12 @@ ldbm_back_delete(
        if ( id2entry_delete( be, e ) != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "ldbm_back_delete: (%s) operations error\n",
-                          dn ));
+                       "ldbm_back_delete: (%s) operations error\n",
+                       dn->bv_val ));
 #else
                Debug(LDAP_DEBUG_ARGS,
                        "<=- ldbm_back_delete: operations error %s\n",
-                       dn, 0, 0);
+                       dn->bv_val, 0, 0);
 #endif
 
                send_ldap_result( conn, op, LDAP_OTHER,
@@ -244,8 +242,6 @@ ldbm_back_delete(
        rc = 0;
 
 return_results:;
-       if ( pdn != NULL ) free(pdn);
-
        if( p != NULL ) {
                /* free parent and writer lock */
                cache_return_entry_w( &li->li_cache, p );