From: Howard Chu <hyc@openldap.org>
Date: Thu, 13 Dec 2007 21:25:03 +0000 (+0000)
Subject: More for ITS#5262, -q fixes from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_40~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb38c6fcc7ffe8bda562ecc5ff22ab38dbc6ea72;p=thirdparty%2Fopenldap.git

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 eb7fbdb3fa..421838d6b2 100644
--- 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 ca3b0f60d7..37b639fdf4 100644
--- 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 ) ) {