]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
doveconf: When not expanding <file input, show the '<' prefix.
authorTimo Sirainen <tss@iki.fi>
Mon, 12 Oct 2009 20:47:00 +0000 (16:47 -0400)
committerTimo Sirainen <tss@iki.fi>
Mon, 12 Oct 2009 20:47:00 +0000 (16:47 -0400)
--HG--
branch : HEAD

src/config/config-parser.c

index d067669319e3b27582d419357ec5a2120597a781..fc2c20d359084091390fe120e3b658130d8f2a3f 100644 (file)
@@ -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;
                        }