[dovecot-cvs] dovecot/src/master mail-process.c, 1.96.2.8, 1.96.2.9 master-settings.c, 1.125.2.14, 1.125.2.15 master-settings.h, 1.83.2.4, 1.83.2.5

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	mail-process.c master-settings.c master-settings.h 
Log Message:
Renamed default_mail_env to mail_location. Keep the default_mail_env working
anyway for backwards compatibility.



Index: mail-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.96.2.8
retrieving revision 1.96.2.9
diff -u -d -r1.96.2.8 -r1.96.2.9
--- mail-process.c	8 Oct 2006 17:27:13 -0000	1.96.2.8
+++ mail-process.c	17 Oct 2006 10:55:51 -0000	1.96.2.9
@@ -283,8 +283,8 @@
 	/* 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 || *mail == '\0') && *set->default_mail_env != '\0')
-		mail = expand_mail_env(set->default_mail_env, var_expand_table);
+	if ((mail == NULL || *mail == '\0') && *set->mail_location != '\0')
+		mail = expand_mail_env(set->mail_location, var_expand_table);
 	env_put(t_strconcat("MAIL=", mail, NULL));
 
 	if (set->server->namespaces != NULL) {

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.125.2.14
retrieving revision 1.125.2.15
diff -u -d -r1.125.2.14 -r1.125.2.15
--- master-settings.c	22 Sep 2006 14:39:04 -0000	1.125.2.14
+++ master-settings.c	17 Oct 2006 10:55:51 -0000	1.125.2.15
@@ -109,6 +109,7 @@
 	DEF(SET_STR, mail_extra_groups),
 
 	DEF(SET_STR, default_mail_env),
+	DEF(SET_STR, mail_location),
 	DEF(SET_STR, mail_cache_fields),
 	DEF(SET_STR, mail_never_cache_fields),
 	DEF(SET_INT, mail_cache_min_mail_count),
@@ -316,6 +317,7 @@
 	MEMBER(mail_extra_groups) "",
 
 	MEMBER(default_mail_env) "",
+	MEMBER(mail_location) "",
 	MEMBER(mail_cache_fields) "flags",
 	MEMBER(mail_never_cache_fields) "imap.envelope",
 	MEMBER(mail_cache_min_mail_count) 0,
@@ -864,6 +866,10 @@
 		return FALSE;
 	}
 #endif
+	if (*set->mail_location == '\0') {
+		/* keep this for backwards compatibility */
+		set->mail_location = set->default_mail_env;
+	}
 	return TRUE;
 }
 

Index: master-settings.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.83.2.4
retrieving revision 1.83.2.5
diff -u -d -r1.83.2.4 -r1.83.2.5
--- master-settings.h	10 Aug 2006 18:46:21 -0000	1.83.2.4
+++ master-settings.h	17 Oct 2006 10:55:51 -0000	1.83.2.5
@@ -68,6 +68,7 @@
 	const char *mail_extra_groups;
 
 	const char *default_mail_env;
+	const char *mail_location;
 	const char *mail_cache_fields;
 	const char *mail_never_cache_fields;
 	unsigned int mail_cache_min_mail_count;