dovecot: Removed default_mail_env backwards compatibility setting.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/d9b07b5eea4a
changeset: 6247:d9b07b5eea4a
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Aug 09 18:50:56 2007 +0300
description:
Removed default_mail_env backwards compatibility setting.

diffstat:

3 files changed, 11 deletions(-)
src/master/master-settings-defs.c |    1 -
src/master/master-settings.c      |    9 ---------
src/master/master-settings.h      |    1 -

diffs (48 lines):

diff -r 1cc70ab3482a -r d9b07b5eea4a src/master/master-settings-defs.c
--- a/src/master/master-settings-defs.c	Thu Aug 09 17:17:19 2007 +0300
+++ b/src/master/master-settings-defs.c	Thu Aug 09 18:50:56 2007 +0300
@@ -66,7 +66,6 @@ static struct setting_def setting_defs[]
 	DEF_STR(mail_uid),
 	DEF_STR(mail_gid),
 
-	DEF_STR(default_mail_env),
 	DEF_STR(mail_location),
 	DEF_STR(mail_cache_fields),
 	DEF_STR(mail_never_cache_fields),
diff -r 1cc70ab3482a -r d9b07b5eea4a src/master/master-settings.c
--- a/src/master/master-settings.c	Thu Aug 09 17:17:19 2007 +0300
+++ b/src/master/master-settings.c	Thu Aug 09 18:50:56 2007 +0300
@@ -222,7 +222,6 @@ struct settings default_settings = {
 	MEMBER(mail_uid) "",
 	MEMBER(mail_gid) "",
 
-	MEMBER(default_mail_env) "",
 	MEMBER(mail_location) "",
 	MEMBER(mail_cache_fields) "",
 	MEMBER(mail_never_cache_fields) "imap.envelope",
@@ -880,14 +879,6 @@ static bool settings_fix(struct settings
 	/* fix relative paths */
 	fix_base_path(set, &set->login_dir);
 
-	if (*set->mail_location == '\0') {
-		/* keep this for backwards compatibility */
-		set->mail_location = set->default_mail_env;
-	} else if (*set->default_mail_env != '\0') {
-		i_error("Both mail_location and default_mail_env set. "
-			"Use only one of them.");
-		return FALSE;
-	}
 	if (nochecks)
 		return TRUE;
 	if (!settings_verify(set))
diff -r 1cc70ab3482a -r d9b07b5eea4a src/master/master-settings.h
--- a/src/master/master-settings.h	Thu Aug 09 17:17:19 2007 +0300
+++ b/src/master/master-settings.h	Thu Aug 09 18:50:56 2007 +0300
@@ -78,7 +78,6 @@ struct settings {
 	const char *mail_uid;
 	const char *mail_gid;
 
-	const char *default_mail_env;
 	const char *mail_location;
 	const char *mail_cache_fields;
 	const char *mail_never_cache_fields;