fix previous commit

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index ddcc0233c14cb2c247507e973d82bef1a21269e9..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;
 }