More places where LOCK_ID() calls need to be checked.

diff --git a/servers/slapd/back-bdb/attribute.c b/servers/slapd/back-bdb/attribute.c
index b41177b4e74fdb4750091ca0a8c567b27646af43..00a16b0ee0a3b1670b6cfc094e502915ba77f38e 100644 (file)
--- a/servers/slapd/back-bdb/attribute.c
+++ b/servers/slapd/back-bdb/attribute.c
@@ -67,10 +67,12 @@ bdb_attribute(
                txn = boi->boi_txn;
        }
 
-       if ( txn != NULL )
+       if ( txn != NULL ) {
                locker = TXN_ID ( txn );
-       else
+       } else {
+               /* XXYYZ: need to check return value */
                LOCK_ID ( bdb->bi_dbenv, &locker );
+       }
 
        if (target != NULL && dn_match(&target->e_nname, entry_ndn)) {
                /* we already have a LOCKED copy of the entry */

diff --git a/servers/slapd/back-bdb/bind.c b/servers/slapd/back-bdb/bind.c
index ebd4880642383e15872e3fc971ed94ef295cfc55..b9c44d0e948dd680d3e74acec22b36746c649439 100644 (file)
--- a/servers/slapd/back-bdb/bind.c
+++ b/servers/slapd/back-bdb/bind.c
@@ -49,6 +49,7 @@ bdb_bind(
        Debug( LDAP_DEBUG_ARGS, "==> bdb_bind: dn: %s\n", dn->bv_val, 0, 0);
 #endif
 
+       /* XXYYZ: need to check return value */
        LOCK_ID(bdb->bi_dbenv, &locker);
 
 dn2entry_retry:

diff --git a/servers/slapd/back-bdb/compare.c b/servers/slapd/back-bdb/compare.c
index 25c8cf4f9554480bd81db6913ce5238dda08b2ba..5b73810ddc6deb459b0b54181bcaee492505df8c 100644 (file)
--- a/servers/slapd/back-bdb/compare.c
+++ b/servers/slapd/back-bdb/compare.c
@@ -34,6 +34,7 @@ bdb_compare(
        u_int32_t       locker;
        DB_LOCK         lock;
 
+       /* XXYYZ: need to check return value */
        LOCK_ID ( bdb->bi_dbenv, &locker );
 
 dn2entry_retry:

diff --git a/servers/slapd/back-bdb/group.c b/servers/slapd/back-bdb/group.c
index 59a33e94b387b6d93699bc98394b1fd4206fc281..1d75d60202aa7caeb2742e18c1474f0dbceaea59 100644 (file)
--- a/servers/slapd/back-bdb/group.c
+++ b/servers/slapd/back-bdb/group.c
@@ -79,10 +79,12 @@ bdb_group(
                txn = boi->boi_txn;
        }
 
-       if ( txn )
+       if ( txn ) {
                locker = TXN_ID( txn );
-       else
+       } else {
+               /* XXYYZ: need to check return value */
                LOCK_ID ( bdb->bi_dbenv, &locker );
+       }
 
        if (dn_match(&target->e_name, gr_ndn)) {
                /* we already have a LOCKED copy of the entry */

diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c
index 07c85df4b360f08e9ecdb8430e91542cbb169ec7..279e7a04eee0c4db09e80337af4ec90ce424925b 100644 (file)
--- a/servers/slapd/back-bdb/referral.c
+++ b/servers/slapd/back-bdb/referral.c
@@ -39,6 +39,7 @@ bdb_referrals(
                return rc;
        } 
 
+       /* XXYYZ: need to check return value */
        LOCK_ID ( bdb->bi_dbenv, &locker );
 
 dn2entry_retry:

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 3bea37794c7c29de6cfcd5e97767fc7a143e7632..b5961125563197d2097697e3dd246b0fa9b11fe7 100644 (file)
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -71,6 +71,7 @@ bdb_search(
 
        manageDSAit = get_manageDSAit( op );
 
+       /* XXYYZ: need to check return value */
        LOCK_ID (bdb->bi_dbenv, &locker );
 
        if ( nbase->bv_len == 0 ) {