From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Sat, 8 Nov 2008 00:49:01 +0000 (+0000)
Subject: ITS#5724 partial fix
X-Git-Tag: OPENLDAP_REL_ENG_2_4_13~125
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dc77524add5db4d476f7cee7bc2a36710131f680;p=openldap

ITS#5724 partial fix
---

diff --git a/CHANGES b/CHANGES
index 4e76e61a73..d730615036 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.13 Engineering
 	Fixed liblutil hex conversion (ITS#5699)
+	Fixed slapd database open with real structure (ITS#5724)
 	Added slapd support for certificateListExactMatch from RFC4523 (ITS#5700)
 	Fixed slapd-bdb/hdb invalid db crash (ITS#5698)
 	Added slapo-constraint parameter to allow LDAP URI constraints (ITS#5704)
diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index f0194a739d..58ca3198fc 100644
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -138,22 +138,25 @@ over_db_open(
 {
 	slap_overinfo *oi = be->bd_info->bi_private;
 	slap_overinst *on = oi->oi_list;
-	BackendDB db = *be;
+	BackendInfo *bi_orig = be->bd_info;
 	int rc = 0;
 
-	db.be_flags |= SLAP_DBFLAG_OVERLAY;
-	db.bd_info = oi->oi_orig;
-	if ( db.bd_info->bi_db_open ) {
-		rc = db.bd_info->bi_db_open( &db, cr );
+	be->be_flags |= SLAP_DBFLAG_OVERLAY;
+	be->bd_info = oi->oi_orig;
+	if ( be->bd_info->bi_db_open ) {
+		rc = be->bd_info->bi_db_open( be, cr );
 	}
 
 	for (; on && rc == 0; on=on->on_next) {
-		db.bd_info = &on->on_bi;
-		if ( db.bd_info->bi_db_open ) {
-			rc = db.bd_info->bi_db_open( &db, cr );
+		be->bd_info = &on->on_bi;
+		if ( be->bd_info->bi_db_open ) {
+			rc = be->bd_info->bi_db_open( be, cr );
 		}
 	}
 
+	be->bd_info = bi_orig;
+	be->be_flags ^= SLAP_DBFLAG_OVERLAY;
+
 	return rc;
 }