Sync with HEAD

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

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 ) ) {