dovecot-1.2: deliver: Ignore !include_try, give error if !includ...

dovecot at dovecot.org dovecot at dovecot.org
Wed Nov 19 19:54:45 EET 2008


details:   http://hg.dovecot.org/dovecot-1.2/rev/7dcffe7ee7f5
changeset: 8452:7dcffe7ee7f5
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Nov 19 19:42:46 2008 +0200
description:
deliver: Ignore !include_try, give error if !include is tried to be used.

diffstat:

1 file changed, 7 insertions(+)
src/deliver/deliver.c |    7 +++++++

diffs (17 lines):

diff -r e14aabe52d8e -r 7dcffe7ee7f5 src/deliver/deliver.c
--- a/src/deliver/deliver.c	Wed Nov 19 19:37:26 2008 +0200
+++ b/src/deliver/deliver.c	Wed Nov 19 19:42:46 2008 +0200
@@ -367,6 +367,13 @@ static void config_file_init(const char 
 		while (IS_WHITE(line[len-1]))
 			len--;
 		line[len] = '\0';
+
+		if (strncmp(line, "!include_try ", 13) == 0)
+			continue;
+		if (strncmp(line, "!include ", 9) == 0) {
+			i_fatal_status(EX_CONFIG, "Error in config file %s: "
+				       "deliver doesn't support !include directive", path);
+		}
 
 		value = p = strchr(line, '=');
 		if (value == NULL) {


More information about the dovecot-cvs mailing list