]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/backend.c
Preliminary checkin for new access_allowed() signature. Still need
[openldap] / servers / slapd / backend.c
index f054e506779869b28d4dff99642f0e24174e7102..4953724f4df08d570866cd4d06d5b3f98e306d40 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,6 +34,7 @@
 #include <sys/stat.h>
 
 #include "slap.h"
+#include "config.h"
 #include "lutil.h"
 #include "lber_pvt.h"
 
@@ -189,7 +190,7 @@ backend_set_controls( BackendDB *be )
 }
 
 /* startup a specific backend database */
-int backend_startup_one(Backend *be)
+int backend_startup_one(Backend *be, ConfigReply *cr)
 {
        int             rc = 0;
 
@@ -208,15 +209,39 @@ int backend_startup_one(Backend *be)
        /* set database controls */
        (void)backend_set_controls( be );
 
+#if 0
+       if ( !BER_BVISEMPTY( &be->be_rootndn )
+               && select_backend( &be->be_rootndn, 0 ) == be
+               && BER_BVISNULL( &be->be_rootpw ) )
+       {
+               /* warning: if rootdn entry is created,
+                * it can take rootdn privileges;
+                * set empty rootpw to prevent */
+       }
+#endif
+
        if ( be->bd_info->bi_db_open ) {
-               rc = be->bd_info->bi_db_open( be );
+               rc = be->bd_info->bi_db_open( be, cr );
                if ( rc == 0 ) {
                        (void)backend_set_controls( be );
 
                } else {
+                       char *type = be->bd_info->bi_type;
+                       char *suffix = "(null)";
+
+                       if ( overlay_is_over( be ) ) {
+                               slap_overinfo   *oi = (slap_overinfo *)be->bd_info->bi_private;
+                               type = oi->oi_orig->bi_type;
+                       }
+
+                       if ( be->be_suffix != NULL && !BER_BVISNULL( &be->be_suffix[0] ) ) {
+                               suffix = be->be_suffix[0].bv_val;
+                       }
+
                        Debug( LDAP_DEBUG_ANY,
-                               "backend_startup_one: bi_db_open failed! (%d)\n",
-                               rc, 0, 0 );
+                               "backend_startup_one (type=%s, suffix=\"%s\"): "
+                               "bi_db_open failed! (%d)\n",
+                               type, suffix, rc );
                }
        }
 
@@ -228,6 +253,7 @@ int backend_startup(Backend *be)
        int i;
        int rc = 0;
        BackendInfo *bi;
+       ConfigReply cr={0, ""};
 
        if( ! ( nBackendDB > 0 ) ) {
                /* no databases */
@@ -249,12 +275,12 @@ int backend_startup(Backend *be)
                        }
                }
 
-               return backend_startup_one( be );
+               return backend_startup_one( be, &cr );
        }
 
        /* open frontend, if required */
        if ( frontendDB->bd_info->bi_db_open ) {
-               rc = frontendDB->bd_info->bi_db_open( frontendDB );
+               rc = frontendDB->bd_info->bi_db_open( frontendDB, &cr );
                if ( rc != 0 ) {
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_db_open(frontend) failed! (%d)\n",
@@ -295,10 +321,8 @@ int backend_startup(Backend *be)
                                "has no suffix\n",
                                i, be->bd_info->bi_type, 0 );
                }
-               /* append global access controls */
-               acl_append( &be->be_acl, frontendDB->be_acl, -1 );
 
-               rc = backend_startup_one( be );
+               rc = backend_startup_one( be, &cr );
 
                if ( rc ) return rc;
        }
@@ -334,11 +358,13 @@ int backend_shutdown( Backend *be )
                }
 
                if ( be->bd_info->bi_db_close ) {
-                       be->bd_info->bi_db_close( be );
+                       rc = be->bd_info->bi_db_close( be, NULL );
+                       if ( rc ) return rc;
                }
 
                if( be->bd_info->bi_close ) {
-                       be->bd_info->bi_close( be->bd_info );
+                       rc = be->bd_info->bi_close( be->bd_info );
+                       if ( rc ) return rc;
                }
 
                return 0;
@@ -347,7 +373,7 @@ int backend_shutdown( Backend *be )
        /* close each backend database */
        LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {
                if ( be->bd_info->bi_db_close ) {
-                       be->bd_info->bi_db_close( be );
+                       be->bd_info->bi_db_close( be, NULL );
                }
 
                if(rc != 0) {
@@ -371,7 +397,7 @@ int backend_shutdown( Backend *be )
 
        /* close frontend, if required */
        if ( frontendDB->bd_info->bi_db_close ) {
-               rc = frontendDB->bd_info->bi_db_close ( frontendDB );
+               rc = frontendDB->bd_info->bi_db_close ( frontendDB, NULL );
                if ( rc != 0 ) {
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_db_close(frontend) failed! (%d)\n",
@@ -382,16 +408,18 @@ int backend_shutdown( Backend *be )
        return 0;
 }
 
-void backend_destroy_one( BackendDB *bd, int dynamic )
+/*
+ * This function is supposed to be the exact counterpart
+ * of backend_startup_one(), although this one calls bi_db_destroy()
+ * while backend_startup_one() calls bi_db_open().
+ *
+ * Make sure backend_stopdown_one() destroys resources allocated
+ * by backend_startup_one(); only call backend_destroy_one() when
+ * all stuff in a BackendDB needs to be destroyed
+ */
+void
+backend_stopdown_one( BackendDB *bd )
 {
-       if ( dynamic ) {
-               LDAP_STAILQ_REMOVE(&backendDB, bd, slap_backend_db, be_next );
-       }
-
-       if ( bd->be_syncinfo ) {
-               syncinfo_free( bd->be_syncinfo );
-       }
-
        if ( bd->be_pending_csn_list ) {
                struct slap_csn_entry *csne;
                csne = LDAP_TAILQ_FIRST( bd->be_pending_csn_list );
@@ -407,8 +435,22 @@ void backend_destroy_one( BackendDB *bd, int dynamic )
        }
 
        if ( bd->bd_info->bi_db_destroy ) {
-               bd->bd_info->bi_db_destroy( bd );
+               bd->bd_info->bi_db_destroy( bd, NULL );
        }
+}
+
+void backend_destroy_one( BackendDB *bd, int dynamic )
+{
+       if ( dynamic ) {
+               LDAP_STAILQ_REMOVE(&backendDB, bd, BackendDB, be_next );
+       }
+
+       if ( bd->be_syncinfo ) {
+               syncinfo_free( bd->be_syncinfo, 1 );
+       }
+
+       backend_stopdown_one( bd );
+
        ber_bvarray_free( bd->be_suffix );
        ber_bvarray_free( bd->be_nsuffix );
        if ( !BER_BVISNULL( &bd->be_rootdn ) ) {
@@ -420,18 +462,8 @@ void backend_destroy_one( BackendDB *bd, int dynamic )
        if ( !BER_BVISNULL( &bd->be_rootpw ) ) {
                free( bd->be_rootpw.bv_val );
        }
-       acl_destroy( bd->be_acl, frontendDB->be_acl );
+       acl_destroy( bd->be_acl );
        limits_destroy( bd->be_limits );
-       if ( bd->be_replogfile ) {
-               ch_free( bd->be_replogfile );
-       }
-       if ( bd->be_replica_argsfile ) {
-               ch_free( bd->be_replica_argsfile );
-       }
-       if ( bd->be_replica_pidfile ) {
-               ch_free( bd->be_replica_pidfile );
-       }
-       destroy_replica_info( bd );
        if ( !BER_BVISNULL( &bd->be_update_ndn ) ) {
                ch_free( bd->be_update_ndn.bv_val );
        }
@@ -468,7 +500,7 @@ int backend_destroy(void)
        bd = frontendDB;
        if ( bd ) {
                if ( bd->bd_info->bi_db_destroy ) {
-                       bd->bd_info->bi_db_destroy( bd );
+                       bd->bd_info->bi_db_destroy( bd, NULL );
                }
                ber_bvarray_free( bd->be_suffix );
                ber_bvarray_free( bd->be_nsuffix );
@@ -481,18 +513,8 @@ int backend_destroy(void)
                if ( !BER_BVISNULL( &bd->be_rootpw ) ) {
                        free( bd->be_rootpw.bv_val );
                }
-               acl_destroy( bd->be_acl, frontendDB->be_acl );
-
-               if ( bd->be_replogfile != NULL ) {
-                       free( bd->be_replogfile );
-               }
-               if ( bd->be_replica_argsfile ) {
-                       ch_free( bd->be_replica_argsfile );
-               }
-               if ( bd->be_replica_pidfile ) {
-                       ch_free( bd->be_replica_pidfile );
-               }
-               assert( bd->be_replica == NULL );
+               acl_destroy( bd->be_acl );
+               frontendDB = NULL;
        }
 
        return 0;
@@ -512,13 +534,49 @@ BackendInfo* backend_info(const char *type)
        return NULL;
 }
 
+void
+backend_db_insert(
+       BackendDB *be,
+       int idx
+)
+{
+       /* If idx < 0, just add to end of list */
+       if ( idx < 0 ) {
+               LDAP_STAILQ_INSERT_TAIL(&backendDB, be, be_next);
+       } else if ( idx == 0 ) {
+               LDAP_STAILQ_INSERT_HEAD(&backendDB, be, be_next);
+       } else {
+               int i;
+               BackendDB *b2;
+
+               b2 = LDAP_STAILQ_FIRST(&backendDB);
+               idx--;
+               for (i=0; i<idx; i++) {
+                       b2 = LDAP_STAILQ_NEXT(b2, be_next);
+               }
+               LDAP_STAILQ_INSERT_AFTER(&backendDB, b2, be, be_next);
+       }
+}
+
+void
+backend_db_move(
+       BackendDB *be,
+       int idx
+)
+{
+       LDAP_STAILQ_REMOVE(&backendDB, be, BackendDB, be_next);
+       backend_db_insert(be, idx);
+}
 
 BackendDB *
 backend_db_init(
     const char *type,
-       BackendDB *be )
+       BackendDB *b0,
+       int idx,
+       ConfigReply *cr)
 {
        BackendInfo *bi = backend_info(type);
+       BackendDB *be = b0;
        int     rc = 0;
 
        if( bi == NULL ) {
@@ -531,11 +589,15 @@ backend_db_init(
         */
        if ( !be ) {
                be = ch_calloc( 1, sizeof(Backend) );
+               /* Just append */
+               if ( idx >= nbackends )
+                       idx = -1;
                nbackends++;
-               LDAP_STAILQ_INSERT_TAIL(&backendDB, be, be_next);
+               backend_db_insert( be, idx );
        }
 
        be->bd_info = bi;
+       be->bd_self = be;
 
        be->be_def_limit = frontendDB->be_def_limit;
        be->be_dfltaccess = frontendDB->be_dfltaccess;
@@ -544,23 +606,30 @@ backend_db_init(
        be->be_requires = frontendDB->be_requires;
        be->be_ssf_set = frontendDB->be_ssf_set;
 
-       be->be_pcl_mutexp = &be->be_pcl_mutex;
-       ldap_pvt_thread_mutex_init( be->be_pcl_mutexp );
+       ldap_pvt_thread_mutex_init( &be->be_pcl_mutex );
 
        /* assign a default depth limit for alias deref */
        be->be_max_deref_depth = SLAPD_DEFAULT_MAXDEREFDEPTH; 
 
        if ( bi->bi_db_init ) {
-               rc = bi->bi_db_init( be );
+               rc = bi->bi_db_init( be, cr );
        }
 
        if ( rc != 0 ) {
                fprintf( stderr, "database init failed (%s)\n", type );
-               nbackends--;
-               return NULL;
+               /* If we created and linked this be, remove it and free it */
+               if ( !b0 ) {
+                       LDAP_STAILQ_REMOVE(&backendDB, be, BackendDB, be_next);
+                       ch_free( be );
+                       be = NULL;
+                       nbackends--;
+               }
+       } else {
+               if ( !bi->bi_nDB ) {
+                       backend_init_controls( bi );
+               }
+               bi->bi_nDB++;
        }
-
-       bi->bi_nDB++;
        return( be );
 }
 
@@ -571,12 +640,12 @@ be_db_close( void )
 
        LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {
                if ( be->bd_info->bi_db_close ) {
-                       be->bd_info->bi_db_close( be );
+                       be->bd_info->bi_db_close( be, NULL );
                }
        }
 
        if ( frontendDB->bd_info->bi_db_close ) {
-               (*frontendDB->bd_info->bi_db_close)( frontendDB );
+               frontendDB->bd_info->bi_db_close( frontendDB, NULL );
        }
 
 }
@@ -584,15 +653,14 @@ be_db_close( void )
 Backend *
 select_backend(
        struct berval * dn,
-       int manageDSAit,
        int noSubs )
 {
        int             j;
        ber_len_t       len, dnlen = dn->bv_len;
-       Backend         *be, *b2 = NULL;
+       Backend         *be;
 
        LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {
-               if ( be->be_nsuffix == NULL ) {
+               if ( be->be_nsuffix == NULL || SLAP_DBHIDDEN( be )) {
                        continue;
                }
 
@@ -623,28 +691,12 @@ select_backend(
                        if ( strcmp( be->be_nsuffix[j].bv_val,
                                &dn->bv_val[dnlen-len] ) == 0 )
                        {
-                               if( b2 == NULL ) {
-                                       b2 = be;
-
-                                       if( manageDSAit && len == dnlen &&
-                                               !SLAP_GLUE_SUBORDINATE( be ) ) {
-                                               continue;
-                                       }
-                               } else {
-                                       /* If any parts of the tree are glued, use the first
-                                        * match regardless of manageDSAit. Otherwise use the
-                                        * last match.
-                                        */
-                                       if( !( SLAP_DBFLAGS( be ) & ( SLAP_DBFLAG_GLUE_INSTANCE |
-                                               SLAP_DBFLAG_GLUE_SUBORDINATE )))
-                                               b2 = be;
-                               }
-                               return b2;
+                               return be;
                        }
                }
        }
 
-       return b2;
+       return be;
 }
 
 int
@@ -667,6 +719,26 @@ be_issuffix(
        return 0;
 }
 
+int
+be_issubordinate(
+    Backend *be,
+    struct berval *bvsubordinate )
+{
+       int     i;
+
+       if ( be->be_nsuffix == NULL ) {
+               return 0;
+       }
+
+       for ( i = 0; !BER_BVISNULL( &be->be_nsuffix[i] ); i++ ) {
+               if ( dnIsSuffix( bvsubordinate, &be->be_nsuffix[i] ) ) {
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+
 int
 be_isroot_dn( Backend *be, struct berval *ndn )
 {
@@ -687,7 +759,10 @@ be_slurp_update( Operation *op )
 int
 be_shadow_update( Operation *op )
 {
-       return ( SLAP_SYNC_SHADOW( op->o_bd ) ||
+       /* This assumes that all internal ops (connid <= -1000) on a syncrepl
+        * database are syncrepl operations.
+        */
+       return ( ( SLAP_SYNC_SHADOW( op->o_bd ) && SLAPD_SYNC_IS_SYNCCONN( op->o_connid ) ) ||
                ( SLAP_SHADOW( op->o_bd ) && be_isupdate_dn( op->o_bd, &op->o_ndn ) ) );
 }
 
@@ -716,28 +791,82 @@ be_isroot( Operation *op )
 int
 be_isroot_pw( Operation *op )
 {
-       int result;
+       return be_rootdn_bind( op, NULL ) == LDAP_SUCCESS;
+}
 
-       if ( ! be_isroot_dn( op->o_bd, &op->o_req_ndn ) ) {
-               return 0;
+/*
+ * checks if binding as rootdn
+ *
+ * return value:
+ *     SLAP_CB_CONTINUE                if not the rootdn, or if rootpw is null
+ *     LDAP_SUCCESS                    if rootdn & rootpw
+ *     LDAP_INVALID_CREDENTIALS        if rootdn & !rootpw
+ *
+ * if rs != NULL
+ *     if LDAP_SUCCESS, op->orb_edn is set
+ *     if LDAP_INVALID_CREDENTIALS, response is sent to client
+ */
+int
+be_rootdn_bind( Operation *op, SlapReply *rs )
+{
+       int             rc;
+#ifdef SLAPD_SPASSWD
+       void    *old_authctx = NULL;
+#endif
+
+       assert( op->o_tag == LDAP_REQ_BIND );
+       assert( op->orb_method == LDAP_AUTH_SIMPLE );
+
+       if ( !be_isroot_dn( op->o_bd, &op->o_req_ndn ) ) {
+               return SLAP_CB_CONTINUE;
+       }
+
+       if ( BER_BVISNULL( &op->o_bd->be_rootpw ) ) {
+               /* give the database a chance */
+               return SLAP_CB_CONTINUE;
        }
 
        if ( BER_BVISEMPTY( &op->o_bd->be_rootpw ) ) {
-               return 0;
+               /* rootdn bind explicitly disallowed */
+               rc = LDAP_INVALID_CREDENTIALS;
+               if ( rs ) {
+                       goto send_result;
+               }
+
+               return rc;
        }
 
 #ifdef SLAPD_SPASSWD
-       ldap_pvt_thread_pool_setkey( op->o_threadctx, slap_sasl_bind,
-               op->o_conn->c_sasl_authctx, NULL );
+       ldap_pvt_thread_pool_setkey( op->o_threadctx, (void *)slap_sasl_bind,
+               op->o_conn->c_sasl_authctx, 0, &old_authctx, NULL );
 #endif
 
-       result = lutil_passwd( &op->o_bd->be_rootpw, &op->orb_cred, NULL, NULL );
+       rc = lutil_passwd( &op->o_bd->be_rootpw, &op->orb_cred, NULL, NULL );
 
 #ifdef SLAPD_SPASSWD
-       ldap_pvt_thread_pool_setkey( op->o_threadctx, slap_sasl_bind, NULL, NULL );
+       ldap_pvt_thread_pool_setkey( op->o_threadctx, (void *)slap_sasl_bind,
+               old_authctx, 0, NULL, NULL );
 #endif
 
-       return result == 0;
+       rc = ( rc == 0 ? LDAP_SUCCESS : LDAP_INVALID_CREDENTIALS );
+       if ( rs ) {
+send_result:;
+               rs->sr_err = rc;
+
+               Debug( LDAP_DEBUG_TRACE, "%s: rootdn=\"%s\" bind%s\n", 
+                       op->o_log_prefix, op->o_bd->be_rootdn.bv_val,
+                       rc == LDAP_SUCCESS ? " succeeded" : " failed" );
+
+               if ( rc == LDAP_SUCCESS ) {
+                       /* Set to the pretty rootdn */
+                       ber_dupbv( &op->orb_edn, &op->o_bd->be_rootdn );
+
+               } else {
+                       send_ldap_result( op, rs );
+               }
+       }
+
+       return rc;
 }
 
 int
@@ -831,18 +960,21 @@ backend_check_controls(
 
                        case LDAP_COMPARE_FALSE:
                                if ( !op->o_bd->be_ctrls[cid] && (*ctrls)->ldctl_iscritical ) {
-                                       /* Per RFC 2251 (and LDAPBIS discussions), if the control
-                                        * is recognized and appropriate for the operation (which
-                                        * we've already verified), then the server should make
-                                        * use of the control when performing the operation.
-                                        * 
-                                        * Here we find that operation extended by the control
-                                        * is unavailable in a particular context, and the control
-                                        * is marked Critical, hence the return of
-                                        * unwillingToPerform.
+#ifdef SLAP_CONTROL_X_WHATFAILED
+                                       if ( get_whatFailed( op ) ) {
+                                               char *oids[ 2 ];
+                                               oids[ 0 ] = (*ctrls)->ldctl_oid;
+                                               oids[ 1 ] = NULL;
+                                               slap_ctrl_whatFailed_add( op, rs, oids );
+                                       }
+#endif
+                                       /* RFC 4511 allows unavailableCriticalExtension to be
+                                        * returned when the server is unwilling to perform
+                                        * an operation extended by a recognized critical
+                                        * control.
                                         */
                                        rs->sr_text = "critical control unavailable in context";
-                                       rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+                                       rs->sr_err = LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
                                        goto done;
                                }
                                break;
@@ -864,10 +996,9 @@ backend_check_controls(
                }
        }
 
-       /* temporarily removed */
-#if 0
+#if 0 /* temporarily removed */
        /* check should be generalized */
-       if( get_manageDIT(op) && !be_isroot(op)) {
+       if( get_relax(op) && !be_isroot(op)) {
                rs->sr_text = "requires manager authorization";
                rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
        }
@@ -887,13 +1018,19 @@ backend_check_restrictions(
        slap_mask_t requires;
        slap_mask_t opflag;
        slap_mask_t exopflag = 0;
-       slap_ssf_set_t *ssf;
+       slap_ssf_set_t ssfs, *ssf;
        int updateop = 0;
        int starttls = 0;
        int session = 0;
 
+       restrictops = frontendDB->be_restrictops;
+       requires = frontendDB->be_requires;
+       ssfs = frontendDB->be_ssf_set;
+       ssf = &ssfs;
+
        if ( op->o_bd ) {
-               int     rc = SLAP_CB_CONTINUE;
+               slap_ssf_t *fssf, *bssf;
+               int     rc = SLAP_CB_CONTINUE, i;
 
                if ( op->o_bd->be_chk_controls ) {
                        rc = ( *op->o_bd->be_chk_controls )( op, rs );
@@ -907,14 +1044,13 @@ backend_check_restrictions(
                        return rs->sr_err;
                }
 
-               restrictops = op->o_bd->be_restrictops;
-               requires = op->o_bd->be_requires;
-               ssf = &op->o_bd->be_ssf_set;
-
-       } else {
-               restrictops = frontendDB->be_restrictops;
-               requires = frontendDB->be_requires;
-               ssf = &frontendDB->be_ssf_set;
+               restrictops |= op->o_bd->be_restrictops;
+               requires |= op->o_bd->be_requires;
+               bssf = &op->o_bd->be_ssf_set.sss_ssf;
+               fssf = &ssfs.sss_ssf;
+               for ( i=0; i<sizeof(ssfs)/sizeof(slap_ssf_t); i++ ) {
+                       if ( bssf[i] ) fssf[i] = bssf[i];
+               }
        }
 
        switch( op->o_tag ) {
@@ -1173,7 +1309,8 @@ backend_check_restrictions(
        }
 
        if( ( restrictops & opflag )
-                       || ( exopflag && ( restrictops & exopflag ) ) ) {
+                       || ( exopflag && ( restrictops & exopflag ) )
+                       || (( restrictops & SLAP_RESTRICT_READONLY ) && updateop )) {
                if( ( restrictops & SLAP_RESTRICT_OP_MASK) == SLAP_RESTRICT_OP_READS ) {
                        rs->sr_text = "read operations restricted";
                } else if ( restrictops & exopflag ) {
@@ -1241,8 +1378,18 @@ fe_acl_group(
        int rc;
        GroupAssertion *g;
        Backend *be = op->o_bd;
+       OpExtra         *oex;
+
+       LDAP_SLIST_FOREACH(oex, &op->o_extra, oe_next) {
+               if ( oex->oe_key == (void *)backend_group )
+                       break;
+       }
+
+       if ( oex && ((OpExtraDB *)oex)->oe_db )
+               op->o_bd = ((OpExtraDB *)oex)->oe_db;
 
-       op->o_bd = select_backend( gr_ndn, 0, 0 );
+       if ( !op->o_bd || !SLAP_DBHIDDEN( op->o_bd ))
+               op->o_bd = select_backend( gr_ndn, 0 );
 
        for ( g = op->o_groups; g; g = g->ga_next ) {
                if ( g->ga_be != op->o_bd || g->ga_oc != group_oc ||
@@ -1263,124 +1410,159 @@ fe_acl_group(
        if ( target && dn_match( &target->e_nname, gr_ndn ) ) {
                e = target;
                rc = 0;
+
        } else {
                op->o_private = NULL;
                rc = be_entry_get_rw( op, gr_ndn, group_oc, group_at, 0, &e );
                e_priv = op->o_private;
                op->o_private = o_priv;
        }
+
        if ( e ) {
                a = attr_find( e->e_attrs, group_at );
                if ( a ) {
-                       /* If the attribute is a subtype of labeledURI, treat this as
-                        * a dynamic group ala groupOfURLs
+                       /* If the attribute is a subtype of labeledURI,
+                        * treat this as a dynamic group ala groupOfURLs
                         */
-                       if (is_at_subtype( group_at->ad_type,
+                       if ( is_at_subtype( group_at->ad_type,
                                slap_schema.si_ad_labeledURI->ad_type ) )
                        {
                                int i;
                                LDAPURLDesc *ludp;
                                struct berval bv, nbase;
                                Filter *filter;
-                               Entry *user;
+                               Entry *user = NULL;
                                void *user_priv = NULL;
                                Backend *b2 = op->o_bd;
 
                                if ( target && dn_match( &target->e_nname, op_ndn ) ) {
                                        user = target;
-                               } else {
-                                       op->o_bd = select_backend( op_ndn, 0, 0 );
-                                       op->o_private = NULL;
-                                       rc = be_entry_get_rw(op, op_ndn, NULL, NULL, 0, &user );
-                                       user_priv = op->o_private;
-                                       op->o_private = o_priv;
                                }
                                
-                               if ( rc == 0 ) {
-                                       rc = LDAP_COMPARE_FALSE;
-                                       for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ ) {
-                                               if ( ldap_url_parse( a->a_vals[i].bv_val, &ludp ) !=
-                                                       LDAP_URL_SUCCESS )
-                                               {
-                                                       continue;
+                               rc = LDAP_COMPARE_FALSE;
+                               for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ ) {
+                                       if ( ldap_url_parse( a->a_vals[i].bv_val, &ludp ) !=
+                                               LDAP_URL_SUCCESS )
+                                       {
+                                               continue;
+                                       }
+
+                                       BER_BVZERO( &nbase );
+
+                                       /* host, attrs and extensions parts must be empty */
+                                       if ( ( ludp->lud_host && *ludp->lud_host )
+                                               || ludp->lud_attrs
+                                               || ludp->lud_exts )
+                                       {
+                                               goto loopit;
+                                       }
+
+                                       ber_str2bv( ludp->lud_dn, 0, 0, &bv );
+                                       if ( dnNormalize( 0, NULL, NULL, &bv, &nbase,
+                                               op->o_tmpmemctx ) != LDAP_SUCCESS )
+                                       {
+                                               goto loopit;
+                                       }
+
+                                       switch ( ludp->lud_scope ) {
+                                       case LDAP_SCOPE_BASE:
+                                               if ( !dn_match( &nbase, op_ndn ) ) {
+                                                       goto loopit;
                                                }
-                                               BER_BVZERO( &nbase );
-                                               /* host part must be empty */
-                                               /* attrs and extensions parts must be empty */
-                                               if ( ( ludp->lud_host && *ludp->lud_host ) ||
-                                                       ludp->lud_attrs || ludp->lud_exts )
-                                               {
+                                               break;
+                                       case LDAP_SCOPE_ONELEVEL:
+                                               dnParent( op_ndn, &bv );
+                                               if ( !dn_match( &nbase, &bv ) ) {
                                                        goto loopit;
                                                }
-                                               ber_str2bv( ludp->lud_dn, 0, 0, &bv );
-                                               if ( dnNormalize( 0, NULL, NULL, &bv, &nbase,
-                                                       op->o_tmpmemctx ) != LDAP_SUCCESS )
+                                               break;
+                                       case LDAP_SCOPE_SUBTREE:
+                                               if ( !dnIsSuffix( op_ndn, &nbase ) ) {
+                                                       goto loopit;
+                                               }
+                                               break;
+                                       case LDAP_SCOPE_SUBORDINATE:
+                                               if ( dn_match( &nbase, op_ndn ) ||
+                                                       !dnIsSuffix( op_ndn, &nbase ) )
                                                {
                                                        goto loopit;
                                                }
-                                               switch ( ludp->lud_scope ) {
-                                               case LDAP_SCOPE_BASE:
-                                                       if ( !dn_match( &nbase, op_ndn ) ) {
-                                                               goto loopit;
-                                                       }
-                                                       break;
-                                               case LDAP_SCOPE_ONELEVEL:
-                                                       dnParent( op_ndn, &bv );
-                                                       if ( !dn_match( &nbase, &bv ) ) {
-                                                               goto loopit;
-                                                       }
-                                                       break;
-                                               case LDAP_SCOPE_SUBTREE:
-                                                       if ( !dnIsSuffix( op_ndn, &nbase ) ) {
-                                                               goto loopit;
-                                                       }
-                                                       break;
-                                               case LDAP_SCOPE_SUBORDINATE:
-                                                       if ( dn_match( &nbase, op_ndn ) ||
-                                                               !dnIsSuffix( op_ndn, &nbase ) )
-                                                       {
+                                       }
+
+                                       /* NOTE: this could be NULL
+                                        * if no filter is provided,
+                                        * or if filter parsing fails.
+                                        * In the latter case,
+                                        * we should give up. */
+                                       if ( ludp->lud_filter != NULL && ludp->lud_filter != '\0') {
+                                               filter = str2filter_x( op, ludp->lud_filter );
+                                               if ( filter == NULL ) {
+                                                       /* give up... */
+                                                       rc = LDAP_OTHER;
+                                                       goto loopit;
+                                               }
+
+                                               /* only get user if required
+                                                * and not available yet */
+                                               if ( user == NULL ) {   
+                                                       int rc2;
+
+                                                       op->o_bd = select_backend( op_ndn, 0 );
+                                                       op->o_private = NULL;
+                                                       rc2 = be_entry_get_rw( op, op_ndn, NULL, NULL, 0, &user );
+                                                       user_priv = op->o_private;
+                                                       op->o_private = o_priv;
+                                                       if ( rc2 != 0 ) {
+                                                               /* give up... */
+                                                               rc = LDAP_OTHER;
                                                                goto loopit;
                                                        }
                                                }
-                                               filter = str2filter_x( op, ludp->lud_filter );
-                                               if ( filter ) {
-                                                       if ( test_filter( NULL, user, filter ) ==
-                                                               LDAP_COMPARE_TRUE )
-                                                       {
-                                                               rc = 0;
-                                                       }
-                                                       filter_free_x( op, filter );
+
+                                               if ( test_filter( NULL, user, filter ) ==
+                                                       LDAP_COMPARE_TRUE )
+                                               {
+                                                       rc = 0;
                                                }
+                                               filter_free_x( op, filter, 1 );
+                                       }
 loopit:
-                                               ldap_free_urldesc( ludp );
-                                               if ( !BER_BVISNULL( &nbase ) ) {
-                                                       op->o_tmpfree( nbase.bv_val, op->o_tmpmemctx );
-                                               }
-                                               if ( rc == 0 ) break;
+                                       ldap_free_urldesc( ludp );
+                                       if ( !BER_BVISNULL( &nbase ) ) {
+                                               op->o_tmpfree( nbase.bv_val, op->o_tmpmemctx );
                                        }
-                                       if ( user != target ) {
-                                               op->o_private = user_priv;
-                                               be_entry_release_r( op, user );
-                                               op->o_private = o_priv;
+                                       if ( rc != LDAP_COMPARE_FALSE ) {
+                                               break;
                                        }
                                }
+
+                               if ( user != NULL && user != target ) {
+                                       op->o_private = user_priv;
+                                       be_entry_release_r( op, user );
+                                       op->o_private = o_priv;
+                               }
                                op->o_bd = b2;
+
                        } else {
-                               rc = value_find_ex( group_at,
-                               SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
-                               SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
-                               a->a_nvals, op_ndn, op->o_tmpmemctx );
-                               if ( rc == LDAP_NO_SUCH_ATTRIBUTE )
+                               rc = attr_valfind( a,
+                                       SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
+                                       SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
+                                       op_ndn, NULL, op->o_tmpmemctx );
+                               if ( rc == LDAP_NO_SUCH_ATTRIBUTE ) {
                                        rc = LDAP_COMPARE_FALSE;
+                               }
                        }
+
                } else {
                        rc = LDAP_NO_SUCH_ATTRIBUTE;
                }
+
                if ( e != target ) {
                        op->o_private = e_priv;
                        be_entry_release_r( op, e );
                        op->o_private = o_priv;
                }
+
        } else {
                rc = LDAP_NO_SUCH_OBJECT;
        }
@@ -1397,6 +1579,7 @@ loopit:
                g->ga_next = op->o_groups;
                op->o_groups = g;
        }
+
 done:
        op->o_bd = be;
        return rc;
@@ -1412,17 +1595,23 @@ backend_group(
        AttributeDescription *group_at )
 {
        int                     rc;
-       BackendDB               *be_orig;
+       BackendDB *be_orig;
+       OpExtraDB       oex;
 
        if ( op->o_abandon ) {
                return SLAPD_ABANDON;
        }
 
+       oex.oe_db = op->o_bd;
+       oex.oe.oe_key = (void *)backend_group;
+       LDAP_SLIST_INSERT_HEAD(&op->o_extra, &oex.oe, oe_next);
+
        be_orig = op->o_bd;
        op->o_bd = frontendDB;
        rc = frontendDB->be_group( op, target, gr_ndn,
                op_ndn, group_oc, group_at );
        op->o_bd = be_orig;
+       LDAP_SLIST_REMOVE(&op->o_extra, &oex.oe, OpExtra, oe_next);
 
        return rc;
 }
@@ -1436,40 +1625,54 @@ fe_acl_attribute(
        BerVarray *vals,
        slap_access_t access )
 {
-       Entry                   *e = NULL;
        void                    *o_priv = op->o_private, *e_priv = NULL;
        Attribute               *a = NULL;
        int                     freeattr = 0, i, j, rc = LDAP_SUCCESS;
        AccessControlState      acl_state = ACL_STATE_INIT;
+       AclCheck                ak;
        Backend                 *be = op->o_bd;
+       OpExtra         *oex;
+
+       LDAP_SLIST_FOREACH(oex, &op->o_extra, oe_next) {
+               if ( oex->oe_key == (void *)backend_attribute )
+                       break;
+       }
+
+       if ( oex && ((OpExtraDB *)oex)->oe_db )
+               op->o_bd = ((OpExtraDB *)oex)->oe_db;
 
-       op->o_bd = select_backend( edn, 0, 0 );
+       if ( !op->o_bd || !SLAP_DBHIDDEN( op->o_bd ))
+               op->o_bd = select_backend( edn, 0 );
 
        if ( target && dn_match( &target->e_nname, edn ) ) {
-               e = target;
+               ak.ak_e = target;
 
        } else {
                op->o_private = NULL;
-               rc = be_entry_get_rw( op, edn, NULL, entry_at, 0, &e );
+               ak.ak_e = NULL;
+               rc = be_entry_get_rw( op, edn, NULL, entry_at, 0, &ak.ak_e );
                e_priv = op->o_private;
                op->o_private = o_priv;
        } 
 
-       if ( e ) {
+       if ( ak.ak_e ) {
+               ak.ak_state = &acl_state;
+               ak.ak_desc = entry_at;
+               ak.ak_access = access;
                if ( entry_at == slap_schema.si_ad_entry || entry_at == slap_schema.si_ad_children ) {
                        assert( vals == NULL );
 
+                       ak.ak_val = NULL;
                        rc = LDAP_SUCCESS;
                        if ( op->o_conn && access > ACL_NONE &&
-                               access_allowed( op, e, entry_at, NULL,
-                                               access, &acl_state ) == 0 )
+                               access_allowed( op, &ak ) == 0 )
                        {
                                rc = LDAP_INSUFFICIENT_ACCESS;
                        }
                        goto freeit;
                }
 
-               a = attr_find( e->e_attrs, entry_at );
+               a = attr_find( ak.ak_e->e_attrs, entry_at );
                if ( a == NULL ) {
                        SlapReply       rs = { 0 };
                        AttributeName   anlist[ 2 ];
@@ -1482,7 +1685,7 @@ fe_acl_attribute(
                        /* NOTE: backend_operational() is also called
                         * when returning results, so it's supposed
                         * to do no harm to entries */
-                       rs.sr_entry = e;
+                       rs.sr_entry = ak.ak_e;
                        rc = backend_operational( op, &rs );
                        rs.sr_entry = NULL;
  
@@ -1501,25 +1704,20 @@ fe_acl_attribute(
                        BerVarray v;
 
                        if ( op->o_conn && access > ACL_NONE &&
-                               access_allowed( op, e, entry_at, NULL,
-                                               access, &acl_state ) == 0 )
+                               access_allowed( op, &ak ) == 0 )
                        {
                                rc = LDAP_INSUFFICIENT_ACCESS;
                                goto freeit;
                        }
 
-                       for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ )
-                               ;
-                       
+                       i = a->a_numvals;
                        v = op->o_tmpalloc( sizeof(struct berval) * ( i + 1 ),
                                op->o_tmpmemctx );
                        for ( i = 0, j = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ )
                        {
+                               ak.ak_val = &a->a_nvals[i];
                                if ( op->o_conn && access > ACL_NONE && 
-                                       access_allowed( op, e, entry_at,
-                                                       &a->a_nvals[i],
-                                                       access,
-                                                       &acl_state ) == 0 )
+                                       access_allowed( op, &ak ) == 0 )
                                {
                                        continue;
                                }
@@ -1540,9 +1738,9 @@ fe_acl_attribute(
                                rc = LDAP_SUCCESS;
                        }
                }
-freeit:                if ( e != target ) {
+freeit:                if ( ak.ak_e != target ) {
                        op->o_private = e_priv;
-                       be_entry_release_r( op, e );
+                       be_entry_release_r( op, ak.ak_e );
                        op->o_private = o_priv;
                }
                if ( freeattr ) {
@@ -1564,13 +1762,19 @@ backend_attribute(
        slap_access_t access )
 {
        int                     rc;
-       BackendDB               *be_orig;
+       BackendDB *be_orig;
+       OpExtraDB       oex;
+
+       oex.oe_db = op->o_bd;
+       oex.oe.oe_key = (void *)backend_attribute;
+       LDAP_SLIST_INSERT_HEAD(&op->o_extra, &oex.oe, oe_next);
 
        be_orig = op->o_bd;
        op->o_bd = frontendDB;
        rc = frontendDB->be_attribute( op, target, edn,
                entry_at, vals, access );
        op->o_bd = be_orig;
+       LDAP_SLIST_REMOVE(&op->o_extra, &oex.oe, OpExtra, oe_next);
 
        return rc;
 }
@@ -1578,48 +1782,43 @@ backend_attribute(
 int 
 backend_access(
        Operation               *op,
-       Entry                   *target,
-       struct berval           *edn,
-       AttributeDescription    *entry_at,
-       struct berval           *nval,
-       slap_access_t           access,
-       slap_mask_t             *mask )
+       AclCheck                *ak,
+       struct berval           *edn )
 {
-       Entry           *e = NULL;
        void            *o_priv = op->o_private, *e_priv = NULL;
        int             rc = LDAP_INSUFFICIENT_ACCESS;
        Backend         *be = op->o_bd;
+       int freeent = 0;
 
        /* pedantic */
        assert( op != NULL );
        assert( op->o_conn != NULL );
        assert( edn != NULL );
-       assert( access > ACL_NONE );
-
-       op->o_bd = select_backend( edn, 0, 0 );
+       assert( ak->ak_access > ACL_NONE );
 
-       if ( target && dn_match( &target->e_nname, edn ) ) {
-               e = target;
+       if ( !op->o_bd ) {
+               op->o_bd = select_backend( edn, 0 );
+       }
 
-       } else {
+       if ( !ak->ak_e || !dn_match( &ak->ak_e->e_nname, edn ) ) {
                op->o_private = NULL;
-               rc = be_entry_get_rw( op, edn, NULL, entry_at, 0, &e );
+               rc = be_entry_get_rw( op, edn, NULL, ak->ak_desc, 0, &ak->ak_e );
+               freeent = 1;
                e_priv = op->o_private;
                op->o_private = o_priv;
        } 
 
-       if ( e ) {
+       if ( ak->ak_e ) {
                Attribute       *a = NULL;
                int             freeattr = 0;
 
-               if ( entry_at == NULL ) {
-                       entry_at = slap_schema.si_ad_entry;
+               if ( ak->ak_desc == NULL ) {
+                       ak->ak_desc = slap_schema.si_ad_entry;
                }
 
-               if ( entry_at == slap_schema.si_ad_entry || entry_at == slap_schema.si_ad_children )
+               if ( ak->ak_desc == slap_schema.si_ad_entry || ak->ak_desc == slap_schema.si_ad_children )
                {
-                       if ( access_allowed_mask( op, e, entry_at,
-                                       NULL, access, NULL, mask ) == 0 )
+                       if ( access_allowed( op, ak ) == 0 )
                        {
                                rc = LDAP_INSUFFICIENT_ACCESS;
 
@@ -1628,13 +1827,13 @@ backend_access(
                        }
 
                } else {
-                       a = attr_find( e->e_attrs, entry_at );
+                       a = attr_find( ak->ak_e->e_attrs, ak->ak_desc );
                        if ( a == NULL ) {
                                SlapReply       rs = { 0 };
                                AttributeName   anlist[ 2 ];
 
-                               anlist[ 0 ].an_name = entry_at->ad_cname;
-                               anlist[ 0 ].an_desc = entry_at;
+                               anlist[ 0 ].an_name = ak->ak_desc->ad_cname;
+                               anlist[ 0 ].an_desc = ak->ak_desc;
                                BER_BVZERO( &anlist[ 1 ].an_name );
                                rs.sr_attrs = anlist;
                        
@@ -1643,7 +1842,7 @@ backend_access(
                                /* NOTE: backend_operational() is also called
                                 * when returning results, so it's supposed
                                 * to do no harm to entries */
-                               rs.sr_entry = e;
+                               rs.sr_entry = ak->ak_e;
                                rc = backend_operational( op, &rs );
                                rs.sr_entry = NULL;
 
@@ -1659,8 +1858,7 @@ backend_access(
                        }
 
                        if ( a ) {
-                               if ( access_allowed_mask( op, e, entry_at,
-                                               nval, access, NULL, mask ) == 0 )
+                               if ( access_allowed( op, ak ) == 0 )
                                {
                                        rc = LDAP_INSUFFICIENT_ACCESS;
                                        goto freeit;
@@ -1668,9 +1866,9 @@ backend_access(
                                rc = LDAP_SUCCESS;
                        }
                }
-freeit:                if ( e != target ) {
+freeit:                if ( freeent ) {
                        op->o_private = e_priv;
-                       be_entry_release_r( op, e );
+                       be_entry_release_r( op, ak->ak_e );
                        op->o_private = o_priv;
                }
                if ( freeattr ) {
@@ -1688,8 +1886,14 @@ fe_aux_operational(
        SlapReply *rs )
 {
        Attribute               **ap;
-       int                     rc = 0;
-       BackendDB               *be_orig;
+       int                     rc = LDAP_SUCCESS;
+       BackendDB               *be_orig = op->o_bd;
+       OpExtra         *oex;
+
+       LDAP_SLIST_FOREACH(oex, &op->o_extra, oe_next) {
+               if ( oex->oe_key == (void *)backend_operational )
+                       break;
+       }
 
        for ( ap = &rs->sr_operational_attrs; *ap; ap = &(*ap)->a_next )
                /* just count them */ ;
@@ -1715,19 +1919,20 @@ fe_aux_operational(
                ap = &(*ap)->a_next;
        }
 
-       if ( op->o_bd != NULL )
+       /* Let the overlays have a chance at this */
+       if ( oex && ((OpExtraDB *)oex)->oe_db )
+               op->o_bd = ((OpExtraDB *)oex)->oe_db;
+
+       if ( !op->o_bd || !SLAP_DBHIDDEN( op->o_bd ))
+               op->o_bd = select_backend( &op->o_req_ndn, 0 );
+
+       if ( op->o_bd != NULL && !be_match( op->o_bd, frontendDB ) &&
+               ( SLAP_OPATTRS( rs->sr_attr_flags ) || rs->sr_attrs ) &&
+               op->o_bd->be_operational != NULL )
        {
-               /* Let the overlays have a chance at this */
-               be_orig = op->o_bd;
-               op->o_bd = select_backend( &op->o_req_ndn, 0, 0 );
-               if ( !be_match( op->o_bd, frontendDB ) &&
-                       ( SLAP_OPATTRS( rs->sr_attr_flags ) || rs->sr_attrs ) &&
-                       op->o_bd != NULL && op->o_bd->be_operational != NULL )
-               {
-                       rc = op->o_bd->be_operational( op, rs );
-               }
-               op->o_bd = be_orig;
+               rc = op->o_bd->be_operational( op, rs );
        }
+       op->o_bd = be_orig;
 
        return rc;
 }
@@ -1736,6 +1941,11 @@ int backend_operational( Operation *op, SlapReply *rs )
 {
        int rc;
        BackendDB *be_orig;
+       OpExtraDB       oex;
+
+       oex.oe_db = op->o_bd;
+       oex.oe.oe_key = (void *)backend_operational;
+       LDAP_SLIST_INSERT_HEAD(&op->o_extra, &oex.oe, oe_next);
 
        /* Moved this into the frontend so global overlays are called */
 
@@ -1743,6 +1953,7 @@ int backend_operational( Operation *op, SlapReply *rs )
        op->o_bd = frontendDB;
        rc = frontendDB->be_operational( op, rs );
        op->o_bd = be_orig;
+       LDAP_SLIST_REMOVE(&op->o_extra, &oex.oe, OpExtra, oe_next);
 
        return rc;
 }