Mercurial > dovecot > core-2.2

changeset 4761:ca5e7977512d HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If both mail_location and default_mail_env are set in the config file, give an error.
author Timo Sirainen <tss@iki.fi>
date Sun, 05 Nov 2006 19:55:49 +0200
parents 557368033389
children 9bc48d105ac5
files src/master/master-settings.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/master-settings.c	Sun Nov 05 19:30:58 2006 +0200
+++ b/src/master/master-settings.c	Sun Nov 05 19:55:49 2006 +0200
@@ -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);
 }