Multi-threaded slapindex

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index f7167bfc510d969bb8c931739ccc62cd57e33b77..054edbe11ab1fbf3cdef36d4f3c903fd83e011e2 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -145,6 +145,8 @@ over_db_config(
                        ct = config_find_keyword( on->on_bi.bi_cf_ocs->co_table, &ca );
                        if ( ct ) {
                                rc = config_add_vals( ct, &ca );
+                               if ( rc != SLAP_CONF_UNKNOWN )
+                                       break;
                        }
                }
                if (on->on_bi.bi_db_config && rc == SLAP_CONF_UNKNOWN) {
@@ -517,7 +519,6 @@ over_op_func(
 {
        slap_overinfo *oi;
        slap_overinst *on;
-       BI_op_bind **func;
        BackendDB *be = op->o_bd, db;
        slap_callback cb = {NULL, over_back_response, NULL, NULL};
        int rc = SLAP_CB_CONTINUE;
@@ -867,6 +868,7 @@ overlay_config( BackendDB *be, const char *ov )
                oi = ch_malloc( sizeof( slap_overinfo ) );
                oi->oi_orig = be->bd_info;
                oi->oi_bi = *be->bd_info;
+               oi->oi_origdb = be;
 
                /* NOTE: the first time a global overlay is configured,
                 * frontendDB gets this flag; it is used later by overlays
@@ -912,7 +914,7 @@ overlay_config( BackendDB *be, const char *ov )
                bi->bi_chk_controls = over_aux_chk_controls;
 
 #ifdef SLAP_OVERLAY_ACCESS
-               /* this has a specific arglist */
+               /* these have specific arglists */
                bi->bi_access_allowed = over_access_allowed;
                bi->bi_acl_group = over_acl_group;
                bi->bi_acl_attribute = over_acl_attribute;