Fix prev commit, overlay config was broken

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 2d5a0f9f90048ff2869d13ad0fc54b480aa82c0d..53616faadcc9ee6bb5eb07d9ad51fdc4fb61b10f 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -491,7 +491,8 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
                                if ( ct ) {
                                        rc = config_add_vals( ct, c );
                                }
-                       } else if ( c->bi->bi_config ) {
+                       }
+                       if ( c->bi->bi_config && rc == SLAP_CONF_UNKNOWN ) {
                                rc = (*c->bi->bi_config)(c->bi, c->fname, c->lineno,
                                        c->argc, c->argv);
                        }
@@ -514,7 +515,8 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
                                if ( ct ) {
                                        rc = config_add_vals( ct, c );
                                }
-                       } else if ( c->be->be_config ) {
+                       }
+                       if ( c->be->be_config && rc == SLAP_CONF_UNKNOWN ) {
                                rc = (*c->be->be_config)(c->be, c->fname, c->lineno,
                                        c->argc, c->argv);
                        }