From: Timo Sirainen <tss@iki.fi>
Date: Tue, 28 Sep 2010 16:09:50 +0000 (+0100)
Subject: config: Don't even try to open <file settings for modules we don't care about.
X-Git-Tag: 2.0.5~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=098e1a7aef39722fd2d4b4e4535eb9e6aedd1ef2;p=thirdparty%2Fdovecot%2Fcore.git

config: Don't even try to open <file settings for modules we don't care about.
---

diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index fbeb02aabc..bd007adeb4 100644
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -656,8 +656,9 @@ static int config_write_value(struct config_parser_context *ctx,
 			str_append_c(str, '<');
 			str_append(str, value);
 		} else {
-			if (str_append_file(str, key, value, &error) < 0 &&
-			    config_require_key(ctx, key)) {
+			if (!config_require_key(ctx, key)) {
+				/* don't even try to open the file */
+			} else if (str_append_file(str, key, value, &error) < 0) {
 				/* file reading failed */
 				ctx->error = p_strdup(ctx->pool, error);
 				return -1;