From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 12 Feb 2008 00:01:48 +0000 (+0000)
Subject: ITS#5322
X-Git-Tag: OPENLDAP_REL_ENG_2_4_8~61
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=88590f7d6b6e7cd01bf75fc9e810ca539e05f791;p=openldap

ITS#5322
---

diff --git a/CHANGES b/CHANGES
index 1bdc13a0c4..727dee2a14 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ OpenLDAP 2.4.8 Engineering
 	Fixed slapd NULL printf (ITS#5264)	
 	Fixed slapd NULL set values (ITS#5286)
 	Fixed slapd segv with SASL/OTP (ITS#5259)
+	Fixed slapd-bdb segv with bdb4.6 (ITS#5322)
 	Added slapd-bdb/slapd-hdb DB encryption (ITS#5359)
 	Fixed slapd-ldif delete (ITS#5265)
 	Fixed slapd-monitor crash (ITS#5311)
diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 3b4d42672c..ffb11ff069 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -600,7 +600,7 @@ bdb_db_close( BackendDB *be, ConfigReply *cr )
 	/* close db environment */
 	if( bdb->bi_dbenv ) {
 		/* Free cache locker if we enabled locking */
-		if ( !( slapMode & SLAP_TOOL_QUICK )) {
+		if ( !( slapMode & SLAP_TOOL_QUICK ) && bdb->bi_cache.c_locker ) {
 #if DB_VERSION_FULL >= 0x04060012
 			XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker->id);
 #else