ITS#5322

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)

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