From: Timo Sirainen <tss@iki.fi>
Date: Tue, 28 Sep 2010 16:09:29 +0000 (+0100)
Subject: doveconf: Skip verifying settings for modules we don't care about.
X-Git-Tag: 2.0.5~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e982ce57ae92ab7ac22496357219697676fab731;p=thirdparty%2Fdovecot%2Fcore.git

doveconf: Skip verifying settings for modules we don't care about.
This was done sometimes, but not always.
---

diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index ccb4b7e051..fbeb02aabc 100644
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -286,12 +286,13 @@ config_filter_parser_check(struct config_parser_context *ctx,
 			   const struct config_module_parser *p,
 			   const char **error_r)
 {
-	/* skip checking settings we don't care about */
-	if (*ctx->module != '\0' &&
-	    !config_module_want_parser(ctx->root_parsers, ctx->module, p->root))
-		return 0;
-
 	for (; p->root != NULL; p++) {
+		/* skip checking settings we don't care about */
+		if (*ctx->module != '\0' &&
+		    !config_module_want_parser(ctx->root_parsers,
+					       ctx->module, p->root))
+			continue;
+
 		settings_parse_var_skip(p->parser);
 		if (!settings_parser_check(p->parser, ctx->pool, error_r))
 			return -1;