From 86bac33327afa350b3e52a57eb56374b5b67b316 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Thu, 13 Dec 2007 08:05:24 +0000
Subject: [PATCH] Sync with HEAD
---
servers/slapd/back-bdb/dn2id.c | 3 +++
servers/slapd/back-bdb/tools.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index d4462365ce..7cf12c0bbe 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 05e6fc3fba..b36ead159e 100644
--- 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 ) ) {
--
GitLab