From 57a725477784fb4ef0976f5e73a3f14694df1a0b Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 30 Jun 2004 03:10:52 +0000 Subject: [PATCH] Import li->be removal fix from HEAD --- servers/slapd/back-ldap/back-ldap.h | 2 -- servers/slapd/back-ldap/bind.c | 4 ++-- servers/slapd/back-ldap/init.c | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h index 4ab4d34d37..6e9de5f4e3 100644 --- a/servers/slapd/back-ldap/back-ldap.h +++ b/servers/slapd/back-ldap/back-ldap.h @@ -35,7 +35,6 @@ LDAP_BEGIN_DECL struct slap_conn; struct slap_op; -struct slap_backend_db; struct ldapconn { struct slap_conn *conn; @@ -79,7 +78,6 @@ struct ldaprwmap { }; struct ldapinfo { - struct slap_backend_db *be; char *url; LDAPURLDesc *lud; struct berval binddn; diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c index 41580063e6..a4185efa6b 100644 --- a/servers/slapd/back-ldap/bind.c +++ b/servers/slapd/back-ldap/bind.c @@ -229,8 +229,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; } else { diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c index a9d11f7105..aa42632046 100644 --- a/servers/slapd/back-ldap/init.c +++ b/servers/slapd/back-ldap/init.c @@ -146,7 +146,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; -- 2.39.5