[dovecot-cvs] dovecot/src/deliver deliver.c,1.20.2.14,1.20.2.15

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/deliver
In directory talvi:/tmp/cvs-serv27280/src/deliver

Modified Files:
      Tag: branch_1_0
	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.20.2.14
retrieving revision 1.20.2.15
diff -u -d -r1.20.2.14 -r1.20.2.15
--- deliver.c	13 Oct 2006 14:30:09 -0000	1.20.2.14
+++ deliver.c	17 Oct 2006 10:55:51 -0000	1.20.2.15
@@ -522,10 +522,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);