More for ITS#5262, -q fixes from HEAD

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index eb7fbdb3fa52b8843392884c0f944102c3739b39..421838d6b2134dc1339d40db1c1a16cb5e2ed625 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -33,6 +33,9 @@ bdb_dn2id_lock( struct bdb_info *bdb, struct berval *dn,
        DBT       lockobj;
        int       db_rw;
 
+       if (!locker)
+               return 0;
+
        if (rw)
                db_rw = DB_LOCK_WRITE;
        else

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index ca3b0f60d75f4cba2ce965371b5a7658984fb22d..37b639fdf4b89e18a09074074158b7746aa07a79 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -312,7 +312,7 @@ static int bdb_tool_next_id(
                return 0;
        }
 
-       rc = bdb_cache_find_ndn( op, TXN_ID( tid ), &ndn, &ei );
+       rc = bdb_cache_find_ndn( op, tid ? TXN_ID( tid ) : 0, &ndn, &ei );
        if ( ei ) bdb_cache_entryinfo_unlock( ei );
        if ( rc == DB_NOTFOUND ) {
                if ( !be_issuffix( op->o_bd, &ndn ) ) {