Import li->be removal fix from HEAD

diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h
index 4ab4d34d37e8e0779632ff6d05ad21331c48fd51..6e9de5f4e3002b8add9fbe8484c3afd913c6cdfd 100644 (file)
--- 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 41580063e659fbf9832ab68b09cb3cfd8f640cfd..a4185efa6b28eac5eb82fb32d0cc7f9e9d0fe738 100644 (file)
--- 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 a9d11f7105f89724a53e34e163c8b5d8eecde306..aa426320461d626494635b481832f6b2056f57af 100644 (file)
--- 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;