From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 8 Nov 2005 10:09:30 +0000 (+0000)
Subject: restore the existing BackendDB, in case overlays are in use
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~64
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=419d2925b11a628f274be119ee10c27ffe764d12;p=openldap

restore the existing BackendDB, in case overlays are in use
---

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 894de43f52..443ea4eaaa 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -193,8 +193,8 @@ fe_extended( Operation *op, SlapReply *rs )
 		reqdata = *op->ore_reqdata;
 	}
 
-	if( !(ext = find_extop(supp_ext_list, &op->ore_reqoid )))
-	{
+	ext = find_extop(supp_ext_list, &op->ore_reqoid );
+	if ( ext == NULL ) {
 		Statslog( LDAP_DEBUG_STATS, "%s EXT oid=%s\n",
 		    op->o_log_prefix, op->ore_reqoid.bv_val, 0, 0, 0 );
 		Debug( LDAP_DEBUG_ANY, "do_extended: unsupported operation \"%s\"\n",
@@ -210,6 +210,8 @@ fe_extended( Operation *op, SlapReply *rs )
 		op->ore_reqoid.bv_val, 0 ,0 );
 
 	{ /* start of OpenLDAP extended operation */
+		BackendDB	*bd = op->o_bd;
+
 		rs->sr_err = (ext->ext_main)( op, rs );
 
 		if( rs->sr_err != SLAPD_ABANDON ) {
@@ -224,7 +226,7 @@ fe_extended( Operation *op, SlapReply *rs )
 			}
 
 			if ( op->o_bd == NULL )
-				op->o_bd = frontendDB;
+				op->o_bd = bd;
 			send_ldap_extended( op, rs );
 
 			if ( rs->sr_ref != default_referral ) {