dovecot-2.0: Added setting aliases: mail for mail_location, both...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/da03d0ecd3e7
changeset: 10468:da03d0ecd3e7
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Dec 13 20:09:00 2009 -0500
description:
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.

diffstat:

2 files changed, 4 insertions(+), 4 deletions(-)
src/lib-storage/mail-storage-service.c  |    5 +----
src/lib-storage/mail-storage-settings.c |    3 +++

diffs (35 lines):

diff -r 17596238d8ea -r da03d0ecd3e7 src/lib-storage/mail-storage-service.c
--- a/src/lib-storage/mail-storage-service.c	Sun Dec 13 20:07:47 2009 -0500
+++ b/src/lib-storage/mail-storage-service.c	Sun Dec 13 20:09:00 2009 -0500
@@ -140,10 +140,7 @@ user_reply_handle(struct mail_storage_se
 			}
 #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 -r 17596238d8ea -r da03d0ecd3e7 src/lib-storage/mail-storage-settings.c
--- a/src/lib-storage/mail-storage-settings.c	Sun Dec 13 20:07:47 2009 -0500
+++ b/src/lib-storage/mail-storage-settings.c	Sun Dec 13 20:09:00 2009 -0500
@@ -22,6 +22,7 @@ static bool mail_user_settings_check(voi
 
 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_
 	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),