[dovecot-cvs] dovecot/src/master master-settings.c, 1.125.2.16, 1.125.2.17

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	master-settings.c 
Log Message:
If both mail_location and default_mail_env are set in the config file, give
an error.



Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.125.2.16
retrieving revision 1.125.2.17
diff -u -d -r1.125.2.16 -r1.125.2.17
--- master-settings.c	5 Nov 2006 10:58:55 -0000	1.125.2.16
+++ master-settings.c	5 Nov 2006 17:55:47 -0000	1.125.2.17
@@ -874,6 +874,10 @@
 	if (*set->mail_location == '\0') {
 		/* keep this for backwards compatibility */
 		set->mail_location = set->default_mail_env;
+	} else if (*set->default_mail_env != '\0') {
+		i_error("Both mail_location and default_mail_env set. "
+			"Use only one of them.");
+		return FALSE;
 	}
 	return nochecks ? TRUE : settings_verify(set);
 }