From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 19 Jun 2004 15:16:51 +0000 (+0000)
Subject: li->be didn't work; since it seems to be unnecessary, it's been removed; please check
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~228
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e6065fb20d9bc0da03412441999c76737f439b7f;p=openldap

li->be didn't work; since it seems to be unnecessary, it's been removed; please check
---

diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h
index a16d050434..2161a8a13f 100644
--- a/servers/slapd/back-ldap/back-ldap.h
+++ b/servers/slapd/back-ldap/back-ldap.h
@@ -96,7 +96,6 @@ struct ldapauth {
 };
 
 struct ldapinfo {
-	struct slap_backend_db	*be;
 	char		*url;
 	LDAPURLDesc	*lud;
 	struct ldapauth acl_la;
diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 34029c0ed1..028f4d3aa1 100644
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -230,8 +230,8 @@ ldap_back_getconn(Operation *op, SlapReply *rs)
 	}
 	
 	/* Internal searches are privileged and shared. So is root. */
-	if ( op->o_do_not_cache || be_isroot_dn( li->be, &op->o_ndn ) ) {
-		lc_curr.local_dn = li->be->be_rootndn;
+	if ( op->o_do_not_cache || be_isroot( op ) ) {
+		lc_curr.local_dn = op->o_bd->be_rootndn;
 		lc_curr.conn = NULL;
 		is_priv = 1;
 
diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 75870fac0b..e274baf890 100644
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -153,7 +153,6 @@ ldap_back_db_init(
 	ldap_back_map_init( &li->rwmap.rwm_oc, &mapping );
 	ldap_back_map_init( &li->rwmap.rwm_at, &mapping );
 
-	li->be = be;
 	be->be_private = li;
 	SLAP_DBFLAGS(be) |= SLAP_DBFLAG_NOLASTMOD;