[dovecot-cvs] dovecot-lda/src deliver.c,1.36,1.37
cras at dovecot.org
cras at dovecot.org
Sun Jan 22 14:30:07 EET 2006
Update of /var/lib/cvs/dovecot-lda/src
In directory talvi:/tmp/cvs-serv20733
Modified Files:
deliver.c
Log Message:
Allow mail/default_mail_env to be unset in dovecot.conf. In that case we'll
use autodetection.
Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/deliver.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- deliver.c 14 Jan 2006 23:25:25 -0000 1.36
+++ deliver.c 22 Jan 2006 12:30:04 -0000 1.37
@@ -608,11 +608,10 @@
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");
-
- table = get_var_expand_table(destination, getenv("HOME"));
- mail_env = expand_mail_env(mail_env, table);
+ if (mail_env != NULL) {
+ table = get_var_expand_table(destination, getenv("HOME"));
+ mail_env = expand_mail_env(mail_env, table);
+ }
flags = 0;
if (getenv("FULL_FILESYSTEM_ACCESS") != NULL)
More information about the dovecot-cvs
mailing list