Mercurial > dovecot > original-hg > dovecot-1.2
changeset 6247:d9b07b5eea4a HEAD
Removed default_mail_env backwards compatibility setting.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 09 Aug 2007 18:50:56 +0300 |
| parents | 1cc70ab3482a |
| children | c6b1d8515354 |
| files | src/master/master-settings-defs.c src/master/master-settings.c src/master/master-settings.h |
| diffstat | 3 files changed, 0 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ 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),
--- 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 @@ 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 @@ /* 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))
--- 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 @@ 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;