From: Howard Chu <hyc@openldap.org>
Date: Fri, 9 Sep 2005 07:40:54 +0000 (+0000)
Subject: ITS#3979 better check for duplicate bi_open functions
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~452
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=beaa0f2250470b227369165195d271585db1d13e;p=openldap

ITS#3979 better check for duplicate bi_open functions
---

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 8d719ab1e3..9a32020521 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -477,16 +477,17 @@ glue_open (
 	if (slapMode & SLAP_TOOL_MODE) {
 		for (i = 0; i<gi->gi_nodes; i++) {
 			same = 0;
-			/* Same type as our main backend? */
-			if ( gi->gi_n[i].gn_be->bd_info == on->on_info->oi_orig )
+			/* Same bi_open as our main backend? */
+			if ( gi->gi_n[i].gn_be->bd_info->bi_open ==
+				on->on_info->oi_orig->bi_open )
 				bsame = 1;
 
 			/* Loop thru the bd_info's and make sure we only
 			 * invoke their bi_open functions once each.
 			 */
 			for ( j = 0; j<i; j++ ) {
-				if ( gi->gi_n[i].gn_be->bd_info ==
-					gi->gi_n[j].gn_be->bd_info ) {
+				if ( gi->gi_n[i].gn_be->bd_info->bi_open ==
+					gi->gi_n[j].gn_be->bd_info->bi_open ) {
 					same = 1;
 					break;
 				}