fix previous commit

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 11fec23fa750a50c49502ec43dfabbbe0e67d3ca..0e8b0c27ac58f523020a917bb563462b07cf2884 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -25,6 +25,7 @@
 
 #define SLAPD_TOOLS
 #include "slap.h"
+#include "config.h"
 
 static slap_overinst *overlays;
 
@@ -71,10 +72,14 @@ over_db_config(
        slap_overinfo *oi = be->bd_info->bi_private;
        slap_overinst *on = oi->oi_list;
        BackendInfo *bi_orig = be->bd_info;
+       struct ConfigOCs *be_cf_ocs = be->be_cf_ocs;
+       ConfigArgs ca = {0};
+       ConfigTable *ct;
        int rc = 0;
 
        if ( oi->oi_orig->bi_db_config ) {
                be->bd_info = oi->oi_orig;
+               be->be_cf_ocs = oi->oi_orig->bi_cf_ocs;
                rc = oi->oi_orig->bi_db_config( be, fname, lineno,
                        argc, argv );
 
@@ -123,8 +128,22 @@ over_db_config(
                if ( rc != SLAP_CONF_UNKNOWN ) return rc;
        }
 
+       ca.argv = argv;
+       ca.argc = argc;
+       ca.fname = fname;
+       ca.lineno = lineno;
+       ca.be = be;
        for (; on; on=on->on_next) {
-               if (on->on_bi.bi_db_config) {
+               rc = SLAP_CONF_UNKNOWN;
+               if (on->on_bi.bi_cf_ocs) {
+                       ConfigTable *ct;
+                       ca.bi = &on->on_bi;
+                       ct = config_find_keyword( on->on_bi.bi_cf_ocs->co_table, &ca );
+                       if ( ct ) {
+                               rc = config_add_vals( ct, &ca );
+                       }
+               }
+               if (on->on_bi.bi_db_config && rc == SLAP_CONF_UNKNOWN) {
                        be->bd_info = &on->on_bi;
                        rc = on->on_bi.bi_db_config( be, fname, lineno,
                                argc, argv );
@@ -132,6 +151,8 @@ over_db_config(
                }
        }
        be->bd_info = bi_orig;
+       be->be_cf_ocs = be_cf_ocs;
+       
        return rc;
 }
 
@@ -248,6 +269,7 @@ static int op_rc[] = {
        SLAP_CB_CONTINUE                /* aux_chk_controls; pass to frontend */
 };
 
+#ifdef SLAP_OVERLAY_ACCESS
 static int
 over_access_allowed(
        Operation               *op,
@@ -260,6 +282,7 @@ over_access_allowed(
 {
        slap_overinfo *oi;
        slap_overinst *on;
+       BackendInfo *bi = op->o_bd->bd_info;
        BackendDB *be = op->o_bd, db;
        int rc = SLAP_CB_CONTINUE;
 
@@ -270,14 +293,15 @@ over_access_allowed(
        oi = op->o_bd->bd_info->bi_private;
        on = oi->oi_list;
 
-       if ( !SLAP_ISOVERLAY( op->o_bd ) ) {
-               db = *op->o_bd;
-               db.be_flags |= SLAP_DBFLAG_OVERLAY;
-               op->o_bd = &db;
-       }
-
        for ( ; on; on = on->on_next ) {
                if ( on->on_bi.bi_access_allowed ) {
+                       /* NOTE: do not copy the structure until required */
+                       if ( !SLAP_ISOVERLAY( op->o_bd ) ) {
+                               db = *op->o_bd;
+                               db.be_flags |= SLAP_DBFLAG_OVERLAY;
+                               op->o_bd = &db;
+                       }
+
                        op->o_bd->bd_info = (BackendInfo *)on;
                        rc = on->on_bi.bi_access_allowed( op, e,
                                desc, val, access, state, maskp );
@@ -285,9 +309,22 @@ over_access_allowed(
                }
        }
 
-       if ( rc == SLAP_CB_CONTINUE && oi->oi_orig->bi_access_allowed ) {
-               op->o_bd->bd_info = oi->oi_orig;
-               rc = oi->oi_orig->bi_access_allowed( op, e,
+       if ( rc == SLAP_CB_CONTINUE ) {
+               BI_access_allowed       *bi_access_allowed;
+
+               /* if the database structure was changed, o_bd points to a
+                * copy of the structure; put the original bd_info in place */
+               if ( SLAP_ISOVERLAY( op->o_bd ) ) {
+                       op->o_bd->bd_info = oi->oi_orig;
+               }
+
+               if ( oi->oi_orig->bi_access_allowed ) {
+                       bi_access_allowed = oi->oi_orig->bi_access_allowed;
+               } else {
+                       bi_access_allowed = slap_access_allowed;
+               }
+
+               rc = bi_access_allowed( op, e,
                        desc, val, access, state, maskp );
        }
        /* should not fall thru this far without anything happening... */
@@ -297,8 +334,11 @@ over_access_allowed(
        }
 
        op->o_bd = be;
+       op->o_bd->bd_info = bi;
+
        return rc;
 }
+#endif /* SLAP_OVERLAY_ACCESS */
 
 static int
 over_op_func(
@@ -684,8 +724,10 @@ overlay_config( BackendDB *be, const char *ov )
                bi->bi_chk_referrals = over_aux_chk_referrals;
                bi->bi_chk_controls = over_aux_chk_controls;
 
+#ifdef SLAP_OVERLAY_ACCESS
                /* this has a specific arglist */
                bi->bi_access_allowed = over_access_allowed;
+#endif /* SLAP_OVERLAY_ACCESS */
                
                bi->bi_connection_destroy = over_connection_destroy;