From c150333b9123fe33155e7eaa718b378d5151b242 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 20 Feb 2009 01:26:01 +0000
Subject: [PATCH] ITS#5724
---
CHANGES | 2 ++
servers/slapd/back-relay/init.c | 4 ++--
servers/slapd/backover.c | 19 ++++++++-----------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/CHANGES b/CHANGES
index 5e0e502184..4ba194ace5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,12 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.15 Release (2009/02/19)
Fixed libldap GnuTLS compilation (ITS#5955)
+ Fixed slapd bconfig conversion again (ITS#5346)
Fixed slapd corrupt contextCSN (ITS#5947)
Fixed slapd syncrepl order to match on add/delete (ITS#5954)
Fixed slapd-bdb/hdb behavior with unallocatable shm (ITS#5956)
Fixed slapd-meta with entries with invalid attrs (ITS#5959)
+ Fixed slapd-relay control initialization (ITS#5724)
Fixed slapo-pcache caching invalid entries (ITS#5927)
Fixed slapo-rwm objectClass preservation (ITS#5760)
Fixed slapo-rwm rwm_bva_rewrite handling (ITS#5960)
diff --git a/servers/slapd/back-relay/init.c b/servers/slapd/back-relay/init.c
index 3a3dc69a43..3c8354f026 100644
--- a/servers/slapd/back-relay/init.c
+++ b/servers/slapd/back-relay/init.c
@@ -224,11 +224,11 @@ relay_back_db_open( Backend *be, ConfigReply *cr )
}
/* inherit controls */
- AC_MEMCPY( be->be_ctrls, ri->ri_bd->be_ctrls, sizeof( be->be_ctrls ) );
+ AC_MEMCPY( be->bd_self->be_ctrls, ri->ri_bd->be_ctrls, sizeof( be->be_ctrls ) );
} else {
/* inherit all? */
- AC_MEMCPY( be->be_ctrls, frontendDB->be_ctrls, sizeof( be->be_ctrls ) );
+ AC_MEMCPY( be->bd_self->be_ctrls, frontendDB->be_ctrls, sizeof( be->be_ctrls ) );
}
return 0;
diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index d69cf12c06..1be6cfa3e9 100644
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -140,25 +140,22 @@ over_db_open(
{
slap_overinfo *oi = be->bd_info->bi_private;
slap_overinst *on = oi->oi_list;
- BackendInfo *bi_orig = be->bd_info;
+ BackendDB db = *be;
int rc = 0;
- 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 );
+ 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 );
}
for (; on && rc == 0; on=on->on_next) {
- be->bd_info = &on->on_bi;
- if ( be->bd_info->bi_db_open ) {
- rc = be->bd_info->bi_db_open( be, cr );
+ 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 = bi_orig;
- be->be_flags ^= SLAP_DBFLAG_OVERLAY;
-
return rc;
}
--
GitLab