From: Timo Sirainen <tss@iki.fi>
Date: Mon, 12 Oct 2009 20:47:00 +0000 (-0400)
Subject: doveconf: When not expanding <file input, show the '<' prefix.
X-Git-Tag: 2.0.alpha1~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1a2ad6c289e77cb72f772bde4cd2d54099916bf;p=thirdparty%2Fdovecot%2Fcore.git

doveconf: When not expanding <file input, show the '<' prefix.

--HG--
branch : HEAD
---

diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index d067669319..fc2c20d359 100644
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -623,9 +623,12 @@ prevfile:
 			str_append(str, key);
 			str_append_c(str, '=');
 
-			if (type != CONFIG_LINE_TYPE_KEYFILE || !expand_files)
+			if (type != CONFIG_LINE_TYPE_KEYFILE)
 				str_append(str, value);
-			else if (str_append_file(str, key, value, &errormsg) < 0) {
+			else if (!expand_files) {
+				str_append_c(str, '<');
+				str_append(str, value);
+			} else if (str_append_file(str, key, value, &errormsg) < 0) {
 				/* file reading failed */
 				break;
 			}