]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/backend.c
declare oc_bvfind_undef()
[openldap] / servers / slapd / backend.c
index d5cb3d77d57ddef935fea84dd20a5feea5a657d6..d04e0041a8b33a4dd10e4b5306f795a55666936f 100644 (file)
@@ -56,107 +56,24 @@ static void call_group_postop_plugins( Operation *op );
  * imported into slapd without appropriate __declspec(dllimport) directives.
  */
 
-#if SLAPD_BDB == SLAPD_MOD_STATIC
-#include "back-bdb/external.h"
-#endif
-#if SLAPD_DNSSRV == SLAPD_MOD_STATIC
-#include "back-dnssrv/external.h"
-#endif
-#if SLAPD_HDB == SLAPD_MOD_STATIC
-#include "back-hdb/external.h"
-#endif
-#if SLAPD_LDAP == SLAPD_MOD_STATIC
-#include "back-ldap/external.h"
-#endif
-#if SLAPD_LDBM == SLAPD_MOD_STATIC
-#include "back-ldbm/external.h"
-#endif
-#if SLAPD_META == SLAPD_MOD_STATIC
-#include "back-meta/external.h"
-#endif
-#if SLAPD_MONITOR == SLAPD_MOD_STATIC
-#include "back-monitor/external.h"
-#endif
-#if SLAPD_NULL == SLAPD_MOD_STATIC
-#include "back-null/external.h"
-#endif
-#if SLAPD_PASSWD == SLAPD_MOD_STATIC
-#include "back-passwd/external.h"
-#endif
-#if SLAPD_PERL == SLAPD_MOD_STATIC
-#include "back-perl/external.h"
-#endif
-#if SLAPD_RELAY == SLAPD_MOD_STATIC
-#include "back-relay/external.h"
-#endif
-#if SLAPD_SHELL == SLAPD_MOD_STATIC
-#include "back-shell/external.h"
-#endif
-#if SLAPD_TCL == SLAPD_MOD_STATIC
-#include "back-tcl/external.h"
-#endif
-#if SLAPD_SQL == SLAPD_MOD_STATIC
-#include "back-sql/external.h"
-#endif
-#if SLAPD_PRIVATE == SLAPD_MOD_STATIC
-#include "private/external.h"
-#endif
+/*
+ * This file is automatically generated by configure; it defines
+ * the BackendInfo binfo[] structure with the configured static 
+ * backend info.  It assumes that every backend of type <name> 
+ * provides an initialization function
+ *
+ *     int name_back_initialize( BackendInfo *bi )
+ *
+ * that populates the rest of the structure.
+ */
 
-static BackendInfo binfo[] = {
-#if SLAPD_BDB == SLAPD_MOD_STATIC
-       {"bdb", bdb_initialize},
-#endif
-#if SLAPD_DNSSRV == SLAPD_MOD_STATIC
-       {"dnssrv",      dnssrv_back_initialize},
-#endif
-#if SLAPD_HDB == SLAPD_MOD_STATIC
-       {"hdb", hdb_initialize},
-#endif
-#if SLAPD_LDAP == SLAPD_MOD_STATIC
-       {"ldap",        ldap_back_initialize},
-#endif
-#if SLAPD_LDBM == SLAPD_MOD_STATIC
-       {"ldbm",        ldbm_back_initialize},
-#endif
-#if SLAPD_META == SLAPD_MOD_STATIC
-       {"meta",        meta_back_initialize},
-#endif
-#if SLAPD_MONITOR == SLAPD_MOD_STATIC
-       {"monitor",     monitor_back_initialize},
-#endif
-#if SLAPD_NULL == SLAPD_MOD_STATIC
-       {"null",        null_back_initialize},
-#endif
-#if SLAPD_PASSWD == SLAPD_MOD_STATIC
-       {"passwd",      passwd_back_initialize},
-#endif
-#if SLAPD_PERL == SLAPD_MOD_STATIC
-       {"perl",        perl_back_initialize},
-#endif
-#if SLAPD_RELAY == SLAPD_MOD_STATIC
-       {"relay",       relay_back_initialize},
-#endif
-#if SLAPD_SHELL == SLAPD_MOD_STATIC
-       {"shell",       shell_back_initialize},
-#endif
-#if SLAPD_TCL == SLAPD_MOD_STATIC
-       {"tcl",         tcl_back_initialize},
-#endif
-#if SLAPD_SQL == SLAPD_MOD_STATIC
-       {"sql",         sql_back_initialize},
-#endif
-       /* for any private backend */
-#if SLAPD_PRIVATE == SLAPD_MOD_STATIC
-       {"private",     private_back_initialize},
-#endif
-       {NULL}
-};
+#include "backend.h"
 
 int                    nBackendInfo = 0;
-BackendInfo    *backendInfo = NULL;
+BackendInfo            *backendInfo = NULL;
 
 int                    nBackendDB = 0; 
-BackendDB      *backendDB = NULL;
+BackendDB              *backendDB = NULL;
 
 ldap_pvt_thread_pool_t syncrepl_pool;
 int                    syncrepl_pool_max = SLAP_MAX_SYNCREPL_THREADS;
@@ -169,13 +86,8 @@ int backend_init(void)
 
        if((nBackendInfo != 0) || (backendInfo != NULL)) {
                /* already initialized */
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACKEND, ERR, 
-                       "backend_init:  backend already initialized\n", 0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "backend_init: already initialized.\n", 0, 0, 0 );
-#endif
                return -1;
        }
 
@@ -188,15 +100,9 @@ int backend_init(void)
                rc = binfo[nBackendInfo].bi_init( &binfo[nBackendInfo] );
 
                if(rc != 0) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACKEND, INFO, 
-                               "backend_init:  initialized for type \"%s\"\n",
-                               binfo[nBackendInfo].bi_type, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_init: initialized for type \"%s\"\n",
                                binfo[nBackendInfo].bi_type, 0, 0 );
-#endif
                        /* destroy those we've already inited */
                        for( nBackendInfo--;
                                nBackendInfo >= 0 ;
@@ -220,13 +126,9 @@ int backend_init(void)
        return 0;
 #else
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACKEND, ERR, "backend_init: failed\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY,
                "backend_init: failed\n",
                0, 0, 0 );
-#endif
 
        return rc;
 #endif /* SLAPD_MODULES */
@@ -237,28 +139,16 @@ int backend_add(BackendInfo *aBackendInfo)
        int rc = 0;
 
        if ( aBackendInfo->bi_init == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACKEND, ERR, "backend_add: "
-                       "backend type \"%s\" does not have the (mandatory)init function\n",
-                       aBackendInfo->bi_type, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY, "backend_add: "
                        "backend type \"%s\" does not have the (mandatory)init function\n",
                        aBackendInfo->bi_type, 0, 0 );
-#endif
                return -1;
        }
 
    if ((rc = aBackendInfo->bi_init(aBackendInfo)) != 0) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACKEND, ERR, 
-                       "backend_add:  initialization for type \"%s\" failed\n",
-                       aBackendInfo->bi_type, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "backend_add:  initialization for type \"%s\" failed\n",
                        aBackendInfo->bi_type, 0, 0 );
-#endif
                return rc;
    }
 
@@ -293,32 +183,19 @@ int backend_startup_one(Backend *be)
 
        be->be_pending_csn_list = (struct be_pcl *)
                ch_calloc( 1, sizeof( struct be_pcl ));
-       build_new_dn( &be->be_context_csn, be->be_nsuffix,
-               (struct berval *)&slap_ldapsync_cn_bv, NULL );
 
        LDAP_TAILQ_INIT( be->be_pending_csn_list );
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACKEND, DETAIL1, "backend_startup:  starting \"%s\"\n",
-               be->be_suffix ? be->be_suffix[0].bv_val : "(unknown)",
-               0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE,
                "backend_startup: starting \"%s\"\n",
                be->be_suffix ? be->be_suffix[0].bv_val : "(unknown)",
                0, 0 );
-#endif
        if ( be->bd_info->bi_db_open ) {
                rc = be->bd_info->bi_db_open( be );
                if ( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACKEND, CRIT, 
-                               "backend_startup: bi_db_open failed! (%d)\n", rc, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_db_open failed! (%d)\n",
                                rc, 0, 0 );
-#endif
                }
        }
        return rc;
@@ -331,14 +208,9 @@ int backend_startup(Backend *be)
 
        if( ! ( nBackendDB > 0 ) ) {
                /* no databases */
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACKEND, INFO, 
-                       "backend_startup: %d databases to startup. \n", nBackendDB, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "backend_startup: %d databases to startup.\n",
                        nBackendDB, 0, 0 );
-#endif
                return 1;
        }
 
@@ -346,14 +218,9 @@ int backend_startup(Backend *be)
                if ( be->bd_info->bi_open ) {
                        rc = be->bd_info->bi_open( be->bd_info );
                        if ( rc != 0 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( BACKEND, CRIT,
-                                       "backend_startup: bi_open failed!\n", 0, 0, 0 );
-#else
                                Debug( LDAP_DEBUG_ANY,
                                        "backend_startup: bi_open failed!\n",
                                        0, 0, 0 );
-#endif
 
                                return rc;
                        }
@@ -366,15 +233,9 @@ int backend_startup(Backend *be)
        if ( frontendDB->bd_info->bi_db_open ) {
                rc = frontendDB->bd_info->bi_db_open( frontendDB );
                if ( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACKEND, CRIT, 
-                               "backend_startup: bi_db_open(frontend) failed! (%d)\n",
-                               rc, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_db_open(frontend) failed! (%d)\n",
                                rc, 0, 0 );
-#endif
                        return rc;
                }
        }
@@ -390,37 +251,25 @@ int backend_startup(Backend *be)
                        rc = backendInfo[i].bi_open(
                                &backendInfo[i] );
                        if ( rc != 0 ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( BACKEND, CRIT, 
-                                       "backend_startup: bi_open %d failed!\n", i, 0, 0 );
-#else
                                Debug( LDAP_DEBUG_ANY,
                                        "backend_startup: bi_open %d failed!\n",
                                        i, 0, 0 );
-#endif
                                return rc;
                        }
                }
        }
 
-       ldap_pvt_thread_mutex_init( &syncrepl_rq.rq_mutex );
-       LDAP_STAILQ_INIT( &syncrepl_rq.task_list );
-       LDAP_STAILQ_INIT( &syncrepl_rq.run_list );
+       ldap_pvt_thread_mutex_init( &slapd_rq.rq_mutex );
+       LDAP_STAILQ_INIT( &slapd_rq.task_list );
+       LDAP_STAILQ_INIT( &slapd_rq.run_list );
 
        /* open each backend database */
        for( i = 0; i < nBackendDB; i++ ) {
                if ( backendDB[i].be_suffix == NULL ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACKEND, CRIT, 
-                               "backend_startup: warning, database %d (%s) "
-                               "has no suffix\n",
-                               i, backendDB[i].bd_info->bi_type, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: warning, database %d (%s) "
                                "has no suffix\n",
                                i, backendDB[i].bd_info->bi_type, 0 );
-#endif
                }
                /* append global access controls */
                acl_append( &backendDB[i].be_acl, frontendDB->be_acl );
@@ -435,25 +284,19 @@ int backend_startup(Backend *be)
 
                        if ( !( backendDB[i].be_search && backendDB[i].be_add &&
                                backendDB[i].be_modify && backendDB[i].be_delete )) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG( BACKEND, CRIT, 
-                                       "backend_startup: database(%d) does not support "
-                                       "operations required for syncrepl", i, 0, 0 );
-#else
                                Debug( LDAP_DEBUG_ANY,
                                        "backend_startup: database(%d) does not support "
                                        "operations required for syncrepl", i, 0, 0 );
-#endif
                                continue;
                        }
 
                        LDAP_STAILQ_FOREACH( si, &backendDB[i].be_syncinfo, si_next ) {
                                si->si_be = &backendDB[i];
                                init_syncrepl( si );
-                               ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex );
-                               ldap_pvt_runqueue_insert( &syncrepl_rq,
+                               ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+                               ldap_pvt_runqueue_insert( &slapd_rq,
                                                si->si_interval, do_syncrepl, (void *) si );
-                               ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex );
+                               ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
                        }
                }
        }
@@ -505,15 +348,9 @@ int backend_shutdown( Backend *be )
                }
 
                if(rc != 0) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACKEND, NOTICE, 
-                               "backend_shutdown: bi_db_close %s failed!\n",
-                               backendDB[i].be_type, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_close: bi_db_close %s failed!\n",
                                backendDB[i].be_type, 0, 0 );
-#endif
                }
        }
 
@@ -534,15 +371,9 @@ int backend_shutdown( Backend *be )
        if ( frontendDB->bd_info->bi_db_close ) {
                rc = frontendDB->bd_info->bi_db_close ( frontendDB );
                if ( rc != 0 ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( BACKEND, CRIT, 
-                               "backend_startup: bi_db_close(frontend) failed! (%d)\n",
-                               rc, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY,
                                "backend_startup: bi_db_close(frontend) failed! (%d)\n",
                                rc, 0, 0 );
-#endif
                }
        }
 
@@ -553,11 +384,32 @@ int backend_destroy(void)
 {
        int i;
        BackendDB *bd;
+       syncinfo_t *si_entry;
+       struct slap_csn_entry *csne;
 
        ldap_pvt_thread_pool_destroy( &syncrepl_pool, 1 );
 
        /* destroy each backend database */
        for( i = 0, bd = backendDB; i < nBackendDB; i++, bd++ ) {
+
+               while ( !LDAP_STAILQ_EMPTY( &bd->be_syncinfo )) {
+                       si_entry = LDAP_STAILQ_FIRST( &bd->be_syncinfo );
+                       LDAP_STAILQ_REMOVE_HEAD( &bd->be_syncinfo, si_next );
+                       syncinfo_free( si_entry );
+               }
+
+               if ( bd->be_pending_csn_list ) {
+                       csne = LDAP_TAILQ_FIRST( bd->be_pending_csn_list );
+                       while ( csne ) {
+                               struct slap_csn_entry *tmp_csne = csne;
+
+                               LDAP_TAILQ_REMOVE( bd->be_pending_csn_list, csne, ce_csn_link );
+                               ch_free( csne->ce_csn.bv_val );
+                               csne = LDAP_TAILQ_NEXT( csne, ce_csn_link );
+                               ch_free( tmp_csne );
+                       }
+               }
+               
                if ( bd->bd_info->bi_db_destroy ) {
                        bd->bd_info->bi_db_destroy( bd );
                }
@@ -566,7 +418,6 @@ int backend_destroy(void)
                if ( bd->be_rootdn.bv_val ) free( bd->be_rootdn.bv_val );
                if ( bd->be_rootndn.bv_val ) free( bd->be_rootndn.bv_val );
                if ( bd->be_rootpw.bv_val ) free( bd->be_rootpw.bv_val );
-               if ( bd->be_context_csn.bv_val ) free( bd->be_context_csn.bv_val );
                acl_destroy( bd->be_acl, frontendDB->be_acl );
        }
        free( backendDB );
@@ -590,15 +441,17 @@ int backend_destroy(void)
 
        /* destroy frontend database */
        bd = frontendDB;
-       if ( bd->bd_info->bi_db_destroy ) {
-               bd->bd_info->bi_db_destroy( bd );
+       if ( bd ) {
+               if ( bd->bd_info->bi_db_destroy ) {
+                       bd->bd_info->bi_db_destroy( bd );
+               }
+               ber_bvarray_free( bd->be_suffix );
+               ber_bvarray_free( bd->be_nsuffix );
+               if ( bd->be_rootdn.bv_val ) free( bd->be_rootdn.bv_val );
+               if ( bd->be_rootndn.bv_val ) free( bd->be_rootndn.bv_val );
+               if ( bd->be_rootpw.bv_val ) free( bd->be_rootpw.bv_val );
+               acl_destroy( bd->be_acl, frontendDB->be_acl );
        }
-       ber_bvarray_free( bd->be_suffix );
-       ber_bvarray_free( bd->be_nsuffix );
-       if ( bd->be_rootdn.bv_val ) free( bd->be_rootdn.bv_val );
-       if ( bd->be_rootndn.bv_val ) free( bd->be_rootndn.bv_val );
-       if ( bd->be_rootpw.bv_val ) free( bd->be_rootpw.bv_val );
-       acl_destroy( bd->be_acl, frontendDB->be_acl );
 
        return 0;
 }
@@ -657,8 +510,6 @@ backend_db_init(
        be->be_requires = frontendDB->be_requires;
        be->be_ssf_set = frontendDB->be_ssf_set;
 
-       be->be_context_csn.bv_len = 0;
-       be->be_context_csn.bv_val = NULL;
        be->be_pcl_mutexp = &be->be_pcl_mutex;
        ldap_pvt_thread_mutex_init( be->be_pcl_mutexp );
 
@@ -896,15 +747,9 @@ backend_unbind( Operation *op, SlapReply *rs )
                                 * A preoperation plugin failure will abort the
                                 * entire operation.
                                 */
-#ifdef NEW_LOGGING
-                               LDAP_LOG( OPERATION, INFO,
-                                       "do_bind: Unbind preoperation plugin failed\n",
-                                       0, 0, 0);
-#else
                                Debug(LDAP_DEBUG_TRACE,
                                        "do_bind: Unbind preoperation plugin failed\n",
                                        0, 0, 0);
-#endif
                                return 0;
                        }
                }
@@ -919,15 +764,9 @@ backend_unbind( Operation *op, SlapReply *rs )
                if ( op->o_pb != NULL && slapi_int_call_plugins( &backends[i],
                        SLAPI_PLUGIN_POST_UNBIND_FN, (Slapi_PBlock *)op->o_pb ) < 0 )
                {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, INFO,
-                               "do_unbind: Unbind postoperation plugins failed\n",
-                               0, 0, 0);
-#else
                        Debug(LDAP_DEBUG_TRACE,
                                "do_unbind: Unbind postoperation plugins failed\n",
                                0, 0, 0);
-#endif
                }
 #endif /* defined( LDAP_SLAPI ) */
        }
@@ -978,6 +817,20 @@ backend_check_controls(
                        if( (*ctrls)->ldctl_iscritical && !ldap_charray_inlist(
                                op->o_bd->be_controls, (*ctrls)->ldctl_oid ) )
                        {
+                               /* FIXME: standards compliance issue
+                                *
+                                * 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
+                                * (without regard to criticality).  This code is incorrect
+                                * on two counts.
+                                * 1) a service error (e.g., unwillingToPerform) should be
+                                * returned where a particular backend cannot service the
+                                * operation,
+                                * 2) this error should be returned irregardless of the
+                                * criticality of the control.
+                                */
                                rs->sr_text = "control unavailable in context";
                                rs->sr_err = LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
                                break;
@@ -1393,6 +1246,9 @@ backend_group(
                                if ( target && dn_match( &target->e_nname, op_ndn ) ) {
                                        user = target;
                                } else {
+                                       /* back-bdb stored lockinfo here, we saved it
+                                        * above. Clear it out so that a new lock can be used.
+                                        */
                                        op->o_bd = select_backend( op_ndn, 0, 0 );
                                        rc = be_entry_get_rw(op, op_ndn, NULL, NULL, 0, &user );
                                }
@@ -1401,7 +1257,7 @@ backend_group(
                                        rc = 1;
                                        for (i=0; a->a_vals[i].bv_val; i++) {
                                                if ( ldap_url_parse( a->a_vals[i].bv_val, &ludp ) !=
-                                                       LDAP_SUCCESS )
+                                                       LDAP_URL_SUCCESS )
                                                {
                                                        continue;
                                                }
@@ -1432,8 +1288,8 @@ backend_group(
                                                        break;
 #ifdef LDAP_SCOPE_SUBORDINATE
                                                case LDAP_SCOPE_SUBORDINATE:
-                                                       if ( dn_match( &nbase, op_ndn ) &&
-                                                               !dnIsSuffix(op_ndn, &nbase ))
+                                                       if ( dn_match( &nbase, op_ndn ) ||
+                                                               !dnIsSuffix( op_ndn, &nbase ) )
                                                        {
                                                                goto loopit;
                                                        }
@@ -1497,6 +1353,57 @@ done:
        return rc;
 }
 
+#ifdef LDAP_SLAPI
+static int backend_compute_output_attr(computed_attr_context *c, Slapi_Attr *a, Slapi_Entry *e)
+{
+       BerVarray v;
+       int rc;
+       BerVarray *vals = (BerVarray *)c->cac_private;
+       Operation *op = NULL;
+       int i, j;
+
+       slapi_pblock_get( c->cac_pb, SLAPI_OPERATION, &op );
+       if ( op == NULL ) {
+               return 1;
+       }
+
+       if ( op->o_conn && access_allowed( op,
+               e, a->a_desc, NULL, ACL_AUTH,
+               &c->cac_acl_state ) == 0 ) {
+               return 1;
+       }
+
+       for ( i=0; a->a_vals[i].bv_val; i++ ) ;
+                       
+       v = op->o_tmpalloc( sizeof(struct berval) * (i+1),
+               op->o_tmpmemctx );
+       for ( i=0,j=0; a->a_vals[i].bv_val; i++ ) {
+               if ( op->o_conn && access_allowed( op,
+                       e, a->a_desc,
+                       &a->a_nvals[i],
+                       ACL_AUTH, &c->cac_acl_state ) == 0 ) {
+                       continue;
+               }
+               ber_dupbv_x( &v[j],
+                       &a->a_nvals[i], op->o_tmpmemctx );
+               if (v[j].bv_val ) j++;
+       }
+
+       if (j == 0) {
+               op->o_tmpfree( v, op->o_tmpmemctx );
+               *vals = NULL;
+               rc = 1;
+       } else {
+               v[j].bv_val = NULL;
+               v[j].bv_len = 0;
+               *vals = v;
+               rc = 0;
+       }
+
+       return rc;
+}
+#endif /* LDAP_SLAPI */
+
 int 
 backend_attribute(
        Operation *op,
@@ -1558,6 +1465,27 @@ backend_attribute(
                                rc = LDAP_SUCCESS;
                        }
                }
+#ifdef LDAP_SLAPI
+               else if ( op->o_pb ) {
+                       /* try any computed attributes */
+                       computed_attr_context ctx;
+                       AttributeName aname;
+
+                       slapi_int_pblock_set_operation( op->o_pb, op );
+
+                       ctx.cac_pb = op->o_pb;
+                       ctx.cac_attrs = NULL;
+                       ctx.cac_userattrs = 0;
+                       ctx.cac_opattrs = 0;
+                       ctx.cac_acl_state = acl_state;
+                       ctx.cac_private = (void *)vals;
+
+                       if ( compute_evaluator( &ctx, entry_at->ad_cname.bv_val, e, backend_compute_output_attr ) == 1)
+                               rc = LDAP_INSUFFICIENT_ACCESS;
+                       else
+                               rc = LDAP_SUCCESS;
+               }
+#endif /* LDAP_SLAPI */
 freeit:                if (e != target ) {
                        be_entry_release_r( op, e );
                }
@@ -1573,6 +1501,7 @@ int backend_operational(
 {
        Attribute       **ap;
        int             rc = 0;
+       BackendDB *be_orig;
 
        for ( ap = &rs->sr_operational_attrs; *ap; ap = &(*ap)->a_next )
                /* just count them */ ;
@@ -1583,14 +1512,26 @@ int backend_operational(
         * add them to the attribute list
         */
        if ( SLAP_OPATTRS( rs->sr_attr_flags ) || ( op->ors_attrs &&
-               ad_inlist( slap_schema.si_ad_subschemaSubentry, op->ors_attrs )) ) {
-               *ap = slap_operational_subschemaSubentry( op->o_bd );
+               ad_inlist( slap_schema.si_ad_entryDN, op->ors_attrs )))
+       {
+               *ap = slap_operational_entryDN( rs->sr_entry );
+               ap = &(*ap)->a_next;
+       }
 
+       if ( SLAP_OPATTRS( rs->sr_attr_flags ) || ( op->ors_attrs &&
+               ad_inlist( slap_schema.si_ad_subschemaSubentry, op->ors_attrs )))
+       {
+               *ap = slap_operational_subschemaSubentry( op->o_bd );
                ap = &(*ap)->a_next;
        }
 
-       if ( ( SLAP_OPATTRS( rs->sr_attr_flags ) || op->ors_attrs ) && op->o_bd &&
-               op->o_bd->be_operational != NULL )
+       /* Let the overlays have a chance at this */
+       be_orig = op->o_bd;
+       if ( SLAP_ISOVERLAY( be_orig ))
+               op->o_bd = select_backend( be_orig->be_nsuffix, 0, 0 );
+
+       if (( SLAP_OPATTRS( rs->sr_attr_flags ) || op->ors_attrs ) &&
+               op->o_bd && op->o_bd->be_operational != NULL )
        {
                Attribute       *a;
                
@@ -1605,6 +1546,7 @@ int backend_operational(
                for ( ; *ap; ap = &(*ap)->a_next )
                        /* just count them */ ;
        }
+       op->o_bd = be_orig;
 
        return rc;
 }
@@ -1614,17 +1556,23 @@ static void init_group_pblock( Operation *op, Entry *target,
        Entry *e, struct berval *op_ndn, AttributeDescription *group_at )
 {
        slapi_int_pblock_set_operation( op->o_pb, op );
-       slapi_pblock_set( op->o_pb, SLAPI_TARGET_DN, (void *)target->e_nname.bv_val );
-       slapi_pblock_set( op->o_pb, SLAPI_X_GROUP_ENTRY, (void *)e );
-       slapi_pblock_set( op->o_pb, SLAPI_X_GROUP_OPERATION_DN, (void *)op_ndn->bv_val );
-       slapi_pblock_set( op->o_pb, SLAPI_X_GROUP_ATTRIBUTE, (void *)group_at->ad_cname.bv_val );
+
+       slapi_pblock_set( op->o_pb,
+               SLAPI_X_GROUP_ENTRY, (void *)e );
+       slapi_pblock_set( op->o_pb,
+               SLAPI_X_GROUP_OPERATION_DN, (void *)op_ndn->bv_val );
+       slapi_pblock_set( op->o_pb,
+               SLAPI_X_GROUP_ATTRIBUTE, (void *)group_at->ad_cname.bv_val );
+       slapi_pblock_set( op->o_pb,
+               SLAPI_X_GROUP_TARGET_ENTRY, (void *)target );
 }
 
 static int call_group_preop_plugins( Operation *op )
 {
        int rc;
 
-       rc = slapi_int_call_plugins( op->o_bd, SLAPI_X_PLUGIN_PRE_GROUP_FN, op->o_pb );
+       rc = slapi_int_call_plugins( op->o_bd,
+               SLAPI_X_PLUGIN_PRE_GROUP_FN, op->o_pb );
        if ( rc < 0 ) {
                if (( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE,
                        (void *)&rc ) != 0 ) || rc == LDAP_SUCCESS )