dovecot-2.0: doveconf: When not expanding <file input, show the ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/37e7c4454637
changeset: 10046:37e7c4454637
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Oct 12 16:47:00 2009 -0400
description:
doveconf: When not expanding <file input, show the '<' prefix.

diffstat:

1 file changed, 5 insertions(+), 2 deletions(-)
src/config/config-parser.c |    7 +++++--

diffs (18 lines):

diff -r 6595049c53b2 -r 37e7c4454637 src/config/config-parser.c
--- a/src/config/config-parser.c	Mon Oct 12 16:29:41 2009 -0400
+++ b/src/config/config-parser.c	Mon Oct 12 16:47:00 2009 -0400
@@ -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;
 			}