[dovecot-cvs] dovecot/src/deliver deliver.c,1.31,1.32
tss at dovecot.org
tss at dovecot.org
Tue Oct 17 11:56:01 UTC 2006
Update of /var/lib/cvs/dovecot/src/deliver
In directory talvi:/tmp/cvs-serv27284/src/deliver
Modified Files:
deliver.c
Log Message:
Renamed default_mail_env to mail_location. Keep the default_mail_env working
anyway for backwards compatibility.
Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/deliver.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- deliver.c 13 Oct 2006 12:44:22 -0000 1.31
+++ deliver.c 17 Oct 2006 10:55:58 -0000 1.32
@@ -520,10 +520,14 @@
mail_storage_init();
mail_storage_register_all();
- /* MAIL comes from userdb, DEFAULT_MAIL_ENV from dovecot.conf */
+ /* MAIL comes from userdb, MAIL_LOCATION from dovecot.conf */
mail_env = getenv("MAIL");
if (mail_env == NULL)
+ mail_env = getenv("MAIL_LOCATION");
+ if (mail_env == NULL) {
+ /* Keep this for backwards compatibility */
mail_env = getenv("DEFAULT_MAIL_ENV");
+ }
if (mail_env != NULL) {
table = get_var_expand_table(destination, getenv("HOME"));
mail_env = expand_mail_env(mail_env, table);
More information about the dovecot-cvs
mailing list