Never let ldif_parse_line() return a NULL value with success.

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

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index dcaf399fafd07c9abb777f2abc130bf84a00a992..8d4c14e9c724c90b5b98205a085acb3eb1ee511d 100644 (file)
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -31,16 +31,25 @@ bdb_delete(
        const char *text;
        int             manageDSAit = get_manageDSAit( op );
        AttributeDescription *children = slap_schema.si_ad_children;
+       AttributeDescription *entry = slap_schema.si_ad_entry;
        DB_TXN          *ltid = NULL;
        struct bdb_op_info opinfo;
+
+       u_int32_t       locker;
+       DB_LOCK         lock;
 #if 0
        u_int32_t       lockid;
        DB_LOCK         lock;
 #endif
 
+       int             noop = 0;
+
+#ifdef LDAP_CLIENT_UPDATE
+       Operation* ps_list;
+#endif
+
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "delete", LDAP_LEVEL_ARGS, "==> bdb_delete: %s\n", 
-               dn->bv_val ));
+       LDAP_LOG ( OPERATION, ARGS,  "==> bdb_delete: %s\n", dn->bv_val, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "==> bdb_delete: %s\n",
                dn->bv_val, 0, 0 );
@@ -49,11 +58,11 @@ bdb_delete(
        if( 0 ) {
 retry: /* transaction retry */
                if( e != NULL ) {
-                       bdb_cache_return_entry_w(&bdb->bi_cache, e);
+                       bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
                }
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1, 
-                       "==> bdb_delete: retrying...\n" ));
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "==> bdb_delete: retrying...\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n",
                        0, 0, 0 );
@@ -75,9 +84,9 @@ retry:        /* transaction retry */
        text = NULL;
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "delete", LDAP_LEVEL_ERR, 
+               LDAP_LOG ( OPERATION, ERR, 
                        "==> bdb_delete: txn_begin failed: %s (%d)\n",
-                       db_strerror(rc), rc ));
+                       db_strerror(rc), rc, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_delete: txn_begin failed: %s (%d)\n",
@@ -87,6 +96,8 @@ retry:        /* transaction retry */
                text = "internal error";
                goto return_results;
        }
+
+       locker = TXN_ID ( ltid );
 #if 0
        lockid = TXN_ID( ltid );
 #endif
@@ -111,7 +122,7 @@ retry:      /* transaction retry */
                }
 #endif
                /* get parent */
-               rc = bdb_dn2entry_r( be, ltid, &pdn, &p, NULL, 0 );
+               rc = bdb_dn2entry_r( be, ltid, &pdn, &p, NULL, 0, locker, &lock );
 
                switch( rc ) {
                case 0:
@@ -131,8 +142,8 @@ retry:      /* transaction retry */
 
                if( p == NULL) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1, 
-                               "<=- bdb_delete: parent does not exist\n" ));
+                       LDAP_LOG ( OPERATION, DETAIL1, 
+                               "<=- bdb_delete: parent does not exist\n", 0, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "<=- bdb_delete: parent does not exist\n",
@@ -147,7 +158,7 @@ retry:      /* transaction retry */
                rc = access_allowed( be, conn, op, p,
                        children, NULL, ACL_WRITE, NULL );
 
-               bdb_cache_return_entry_r(&bdb->bi_cache, p);
+               bdb_unlocked_cache_return_entry_r(&bdb->bi_cache, p);
                p = NULL;
 
                switch( opinfo.boi_err ) {
@@ -158,14 +169,15 @@ retry:    /* transaction retry */
 
                if ( !rc  ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1, 
-                               "<=- bdb_delete: no access to parent\n" ));
+                       LDAP_LOG ( OPERATION, DETAIL1, 
+                               "<=- bdb_delete: no write access to parent\n", 0, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
-                               "<=- bdb_delete: no access to parent\n",
+                               "<=- bdb_delete: no write access to parent\n",
                                0, 0, 0 );
 #endif
                        rc = LDAP_INSUFFICIENT_ACCESS;
+                       text = "no write access to parent";
                        goto return_results;
                }
 
@@ -179,6 +191,7 @@ retry:      /* transaction retry */
                                /* check parent for "children" acl */
                                rc = access_allowed( be, conn, op, p,
                                        children, NULL, ACL_WRITE, NULL );
+
                                p = NULL;
 
                                switch( opinfo.boi_err ) {
@@ -189,21 +202,22 @@ retry:    /* transaction retry */
 
                                if ( !rc  ) {
 #ifdef NEW_LOGGING
-                                       LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1, 
-                                               "<=- bdb_delete: no access to parent\n" ));
+                                       LDAP_LOG ( OPERATION, DETAIL1, 
+                                               "<=- bdb_delete: no access to parent\n", 0, 0, 0 );
 #else
                                        Debug( LDAP_DEBUG_TRACE,
                                                "<=- bdb_delete: no access "
                                                "to parent\n", 0, 0, 0 );
 #endif
                                        rc = LDAP_INSUFFICIENT_ACCESS;
+                                       text = "no write access to parent";
                                        goto return_results;
                                }
 
                        } else {
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1, 
-                                       "<=- bdb_delete: no parent and not root\n" ));
+                               LDAP_LOG ( OPERATION, DETAIL1, 
+                                       "<=- bdb_delete: no parent and not root\n", 0, 0, 0 );
 #else
                                Debug( LDAP_DEBUG_TRACE,
                                        "<=- bdb_delete: no parent "
@@ -226,7 +240,7 @@ retry:      /* transaction retry */
        }
 
        /* get entry for read/modify/write */
-       rc = bdb_dn2entry_w( be, ltid, ndn, &e, &matched, DB_RMW );
+       rc = bdb_dn2entry_w( be, ltid, ndn, &e, &matched, DB_RMW, locker, &lock );
 
        switch( rc ) {
        case 0:
@@ -249,9 +263,8 @@ retry:      /* transaction retry */
                BerVarray refs;
 
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "delete", LDAP_LEVEL_ARGS, 
-                       "<=- bdb_delete: no such object %s\n",
-                       dn->bv_val ));
+               LDAP_LOG ( OPERATION, ARGS, 
+                       "<=- bdb_delete: no such object %s\n", dn->bv_val, 0, 0);
 #else
                Debug( LDAP_DEBUG_ARGS,
                        "<=- bdb_delete: no such object %s\n",
@@ -263,7 +276,7 @@ retry:      /* transaction retry */
                        refs = is_entry_referral( matched )
                                ? get_entry_referrals( be, conn, op, matched )
                                : NULL;
-                       bdb_cache_return_entry_r(&bdb->bi_cache, matched );
+                       bdb_unlocked_cache_return_entry_r(&bdb->bi_cache, matched);
                        matched = NULL;
 
                } else {
@@ -281,14 +294,37 @@ retry:    /* transaction retry */
                goto done;
        }
 
+       rc = access_allowed( be, conn, op, e,
+               entry, NULL, ACL_WRITE, NULL );
+
+       switch( opinfo.boi_err ) {
+       case DB_LOCK_DEADLOCK:
+       case DB_LOCK_NOTGRANTED:
+               goto retry;
+       }
+
+       if ( !rc  ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "<=- bdb_delete: no write access to entry\n", 0, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_TRACE,
+                       "<=- bdb_delete: no write access to entry\n",
+                       0, 0, 0 );
+#endif
+               rc = LDAP_INSUFFICIENT_ACCESS;
+               text = "no write access to entry";
+               goto return_results;
+       }
+
        if ( !manageDSAit && is_entry_referral( e ) ) {
                /* entry is a referral, don't allow delete */
                BerVarray refs = get_entry_referrals( be,
                        conn, op, e );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1, 
-                       "<=- bdb_delete: entry is referral\n" ));
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "<=- bdb_delete: entry is referral\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_delete: entry is referral\n",
@@ -304,7 +340,7 @@ retry:      /* transaction retry */
                goto done;
        }
 
-       rc = bdb_dn2id_children( be, ltid, &e->e_nname );
+       rc = bdb_dn2id_children( be, ltid, &e->e_nname, 0 );
        if( rc != DB_NOTFOUND ) {
                switch( rc ) {
                case DB_LOCK_DEADLOCK:
@@ -312,9 +348,8 @@ retry:      /* transaction retry */
                        goto retry;
                case 0:
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "delete", LDAP_LEVEL_DETAIL1, 
-                               "<=- bdb_delete: non-leaf %s\n",
-                               dn->bv_val ));
+                       LDAP_LOG ( OPERATION, DETAIL1, 
+                               "<=- bdb_delete: non-leaf %s\n", dn->bv_val, 0, 0 );
 #else
                        Debug(LDAP_DEBUG_ARGS,
                                "<=- bdb_delete: non-leaf %s\n",
@@ -325,9 +360,9 @@ retry:      /* transaction retry */
                        break;
                default:
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "delete", LDAP_LEVEL_ERR, 
+                       LDAP_LOG ( OPERATION, ERR, 
                                "<=- bdb_delete: has_children failed %s (%d)\n",
-                               db_strerror(rc), rc ));
+                               db_strerror(rc), rc, 0 );
 #else
                        Debug(LDAP_DEBUG_ARGS,
                                "<=- bdb_delete: has_children failed: %s (%d)\n",
@@ -350,9 +385,8 @@ retry:      /* transaction retry */
                        rc = LDAP_OTHER;
                }
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "delete", LDAP_LEVEL_ERR, 
-                       "<=- bdb_delete: dn2id failed %s (%d)\n",
-                       db_strerror(rc), rc ));
+               LDAP_LOG ( OPERATION, ERR, 
+                       "<=- bdb_delete: dn2id failed %s (%d)\n", db_strerror(rc), rc, 0 );
 #else
                Debug(LDAP_DEBUG_ARGS,
                        "<=- bdb_delete: dn2id failed: %s (%d)\n",
@@ -373,9 +407,9 @@ retry:      /* transaction retry */
                        rc = LDAP_OTHER;
                }
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "delete", LDAP_LEVEL_ERR, 
-                       "<=- bdb_delete: id2entry failed: %s (%d)\n",
-                       db_strerror(rc), rc ));
+               LDAP_LOG ( OPERATION, ERR, 
+                       "<=- bdb_delete: id2entry failed: %s (%d)\n", 
+                       db_strerror(rc), rc, 0 );
 #else
                Debug(LDAP_DEBUG_ARGS,
                        "<=- bdb_delete: id2entry failed: %s (%d)\n",
@@ -396,8 +430,8 @@ retry:      /* transaction retry */
                        rc = LDAP_OTHER;
                }
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "delete", LDAP_LEVEL_ERR, 
-                       "<=- bdb_delete: entry index delete failed!\n" ));
+               LDAP_LOG ( OPERATION, ERR, 
+                       "<=- bdb_delete: entry index delete failed!\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "entry index delete failed!\n",
                        0, 0, 0 );
@@ -415,7 +449,12 @@ retry:     /* transaction retry */
 #endif
 
        if( op->o_noop ) {
-               rc = TXN_ABORT( ltid );
+               if ( ( rc = TXN_ABORT( ltid ) ) != 0 ) {
+                       text = "txn_abort (no-op) failed";
+               } else {
+                       noop = 1;
+                       rc = LDAP_SUCCESS;
+               }
        } else {
                rc = TXN_COMMIT( ltid, 0 );
        }
@@ -424,10 +463,9 @@ retry:     /* transaction retry */
 
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "delete", LDAP_LEVEL_ERR, 
+               LDAP_LOG ( OPERATION, ERR, 
                        "bdb_delete: txn_%s failed: %s (%d)\n",
-                       op->o_noop ? "abort (no-op)" : "commit",
-                       db_strerror(rc), rc ));
+                       op->o_noop ? "abort (no-op)" : "commit", db_strerror(rc), rc );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_delete: txn_%s failed: %s (%d)\n",
@@ -439,10 +477,9 @@ retry:     /* transaction retry */
 
        } else {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "delete", LDAP_LEVEL_RESULTS, 
+               LDAP_LOG ( OPERATION, RESULTS, 
                        "bdb_delete: deleted%s id=%08lx db=\"%s\"\n",
-                       op->o_noop ? " (no-op)" : "",
-                       e->e_id, e->e_dn ));
+                       op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_delete: deleted%s id=%08lx dn=\"%s\"\n",
@@ -456,6 +493,14 @@ retry:     /* transaction retry */
 return_results:
        send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
 
+#ifdef LDAP_CLIENT_UPDATE
+        if ( rc == LDAP_SUCCESS && !noop ) {
+               LDAP_LIST_FOREACH( ps_list, &bdb->psearch_list, link ) {
+                       bdb_psearch( be, conn, op, ps_list, e, LCUP_PSEARCH_BY_DELETE );
+               }
+       }
+#endif /* LDAP_CLIENT_UPDATE */
+
        if(rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
                ldap_pvt_thread_yield();
                TXN_CHECKPOINT( bdb->bi_dbenv,
@@ -465,7 +510,7 @@ return_results:
 done:
        /* free entry */
        if( e != NULL ) {
-               bdb_cache_return_entry_w(&bdb->bi_cache, e);
+               bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
        }
 
        if( ltid != NULL ) {
@@ -473,5 +518,5 @@ done:
                op->o_private = NULL;
        }
 
-       return rc;
+       return ( ( rc == LDAP_SUCCESS ) ? noop : rc );
 }