Added setting aliases: mail for mail_location, both of them for namespace location.

Removed special case handling for changing mail to mail_location in userdb.

--HG--
branch : HEAD

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index c257744c3d3529bc27e0cb28f677827a796af082..fe987ecaa9add72fe7c3cc0830a5c6311fd58a8f 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -140,10 +140,7 @@ user_reply_handle(struct mail_storage_service_user *user,
                        }
 #endif
                } else T_BEGIN {
-                       if (strncmp(line, "mail=", 5) == 0) {
-                               line = t_strconcat("mail_location=",
-                                                  line + 5, NULL);
-                       } else if ((p = strchr(str[i], '=')) == NULL)
+                       if ((p = strchr(str[i], '=')) == NULL)
                                line = t_strconcat(str[i], "=yes", NULL);
                        else
                                line = str[i];

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index 043685a0a95dfef9f8262952a1bc9c5f1a0c8644..145af84a51629ead020154716c118da698eb572f 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -22,6 +22,7 @@ static bool mail_user_settings_check(void *_set, pool_t pool, const char **error
 
 static const struct setting_define mail_storage_setting_defines[] = {
        DEF(SET_STR_VARS, mail_location),
+       { SET_ALIAS, "mail", 0, NULL },
        DEF(SET_STR, mail_cache_fields),
        DEF(SET_STR, mail_never_cache_fields),
        DEF(SET_UINT, mail_cache_min_mail_count),
@@ -85,6 +86,8 @@ static const struct setting_define mail_namespace_setting_defines[] = {
        DEF(SET_STR, separator),
        DEF(SET_STR_VARS, prefix),
        DEF(SET_STR_VARS, location),
+       { SET_ALIAS, "mail", 0, NULL },
+       { SET_ALIAS, "mail_location", 0, NULL },
        DEF(SET_STR_VARS, alias_for),
 
        DEF(SET_BOOL, inbox),