Sync with HEAD

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index d4462365ceb8a47e68266bd5e16900c8f5cfc899..7cf12c0bbe7e4501552f18eb0ec52df77e9b728b 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 05e6fc3fbaeb231b4b7b3fd426376b52957aa14b..b36ead159eee3a415370645717bb64efb67487fe 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -340,7 +340,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 ) ) {