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 a16d0504345c16ece48f9c1ea48b79f4b10bf25f..2161a8a13fb015afcf50169a0a2c8026e10e6020 100644 (file)
--- 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 34029c0ed16ad0f9180cd10848efafded5724917..028f4d3aa146b5d468774e952746ebf09be93d1e 100644 (file)
--- 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 75870fac0b27e62c04c6efccdc251e46aec4a788..e274baf89011f10c1694b435c0e92e69090134b5 100644 (file)
--- 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;