Mercurial > dovecot > core-2.2

changeset 10046:37e7c4454637 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doveconf: When not expanding <file input, show the '<' prefix.
author Timo Sirainen <tss@iki.fi>
date Mon, 12 Oct 2009 16:47:00 -0400
parents 6595049c53b2
children 4074f1bed39a
files src/config/config-parser.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
 			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;
 			}