From 585b4a02ef5f1733dbebfcb0d9526311f9204d34 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 16 Mar 2005 20:31:49 +0000 Subject: [PATCH] Fix prev commit, overlay config was broken --- servers/slapd/config.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 2d5a0f9f90..53616faadc 100644 --- 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); } -- 2.39.5