From: Timo Sirainen <tss@iki.fi>
Date: Thu, 23 Sep 2010 18:54:26 +0000 (+0100)
Subject: config: Added conversion support for obsolete sieve/sieve_storage settings.
X-Git-Tag: 2.0.4~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba8a3fbee3f8fca8e481ba929bce6b78296a7820;p=thirdparty%2Fdovecot%2Fcore.git

config: Added conversion support for obsolete sieve/sieve_storage settings.
---

diff --git a/src/config/old-set-parser.c b/src/config/old-set-parser.c
index 78d4817a3b..63ae80b8bc 100644
--- a/src/config/old-set-parser.c
+++ b/src/config/old-set-parser.c
@@ -140,6 +140,18 @@ old_settings_handle_root(struct config_parser_context *ctx,
 		set_rename(ctx, key, "ssl", value);
 		return TRUE;
 	}
+	if (strcmp(key, "sieve") == 0 ||
+	    strcmp(key, "sieve_storage") == 0) {
+		if (strcmp(key, "sieve_storage") == 0)
+			obsolete(ctx, "sieve_storage has been moved into plugin { sieve_dir }");
+		else
+			obsolete(ctx, "%s has been moved into plugin {} section", key);
+
+		config_apply_line(ctx, "", "plugin=", NULL);
+		config_apply_line(ctx, key,
+			t_strdup_printf("plugin/%s=%s", key, value), NULL);
+		return TRUE;
+	}
 	if (strcmp(key, "fsync_disable") == 0) {
 		if (strcasecmp(value, "yes") == 0)
 			value = "never";