From: Timo Sirainen <tss@iki.fi>
Date: Wed, 19 Nov 2008 17:42:46 +0000 (+0200)
Subject: deliver: Ignore !include_try, give error if !include is tried to be used.
X-Git-Tag: 1.2.alpha4~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea6ee8641b3c646d25edc5e7a852685062bbc5cc;p=thirdparty%2Fdovecot%2Fcore.git

deliver: Ignore !include_try, give error if !include is tried to be used.

--HG--
branch : HEAD
---

diff --git a/src/deliver/deliver.c b/src/deliver/deliver.c
index bbd47a88f5..85ea0db135 100644
--- a/src/deliver/deliver.c
+++ b/src/deliver/deliver.c
@@ -368,6 +368,13 @@ static void config_file_init(const char *path)
 			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) {
 			if (strchr(line, '{') != NULL) {