[dovecot-cvs] dovecot-lda/src deliver.c,1.34,1.35

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot-lda/src
In directory talvi:/tmp/cvs-serv25436

Modified Files:
	deliver.c 
Log Message:
userdb mail-overriding got broken



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/deliver.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- deliver.c	2 Jan 2006 13:39:32 -0000	1.34
+++ deliver.c	2 Jan 2006 14:05:30 -0000	1.35
@@ -449,17 +449,17 @@
 
 static void open_logfile(void)
 {
-	if (getenv("USE_SYSLOG") != NULL)
+	if (getenv("LOG_PATH") == NULL)
 		i_set_failure_syslog("deliver", LOG_NDELAY, LOG_MAIL);
 	else {
 		/* log to file or stderr */
-		i_set_failure_file(getenv("LOGFILE"), "deliver");
+		i_set_failure_file(getenv("LOG_PATH"), "deliver");
 	}
 
-	if (getenv("INFOLOGFILE") != NULL)
-		i_set_info_file(getenv("INFOLOGFILE"));
+	if (getenv("INFO_LOG_PATH") != NULL)
+		i_set_info_file(getenv("INFO_LOG_PATH"));
 
-	i_set_failure_timestamp_format(getenv("LOGSTAMP"));
+	i_set_failure_timestamp_format(getenv("LOG_TIMESTAMP"));
 }
 
 static const char *get_sieve_path(void)
@@ -604,7 +604,10 @@
 	mail_storage_register_all();
         duplicate_init();
 
-	mail_env = getenv("DEFAULT_MAIL_ENV");
+	/* MAIL comes from userdb, DEFAULT_MAIL_ENV from dovecot.conf */
+	mail_env = getenv("MAIL");
+	if (mail_env == NULL) 
+		mail_env = getenv("DEFAULT_MAIL_ENV");
 	if (mail_env == NULL)
 		i_fatal_status(EX_CONFIG, "mail setting not given");