Mercurial > dovecot > original-hg > dovecot-1.2

changeset 868:c0048f0ef101 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
default_mail_env wasn't actually working.
author Timo Sirainen <tss@iki.fi>
date Sat, 28 Dec 2002 11:49:16 +0200
parents e1656057b9a5
children 2873d04a566e
files src/master/imap-process.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/imap-process.c	Sat Dec 28 11:04:01 2002 +0200
+++ b/src/master/imap-process.c	Sat Dec 28 11:49:16 2002 +0200
@@ -123,7 +123,10 @@
 				break;
 			}
 
-			if (var != NULL) {
+			if (var == NULL)
+				str_append_c(str, '%');
+			else {
+				env++;
 				if (width == 0)
 					str_append(str, var);
 				else
@@ -132,6 +135,7 @@
 		}
 	}
 
+
 	return str_c(str);
 }
 
@@ -218,7 +222,7 @@
 	/* user given environment - may be malicious. virtual_user comes from
 	   auth process, but don't trust that too much either. Some auth
 	   mechanism might allow leaving extra data there. */
-	if (mail == NULL && set_default_mail_env != NULL) {
+	if ((mail == NULL || *mail == '\0') && set_default_mail_env != NULL) {
 		mail = expand_mail_env(set_default_mail_env,
 				       virtual_user, home);
 		env_put(t_strconcat("MAIL=", mail, NULL));