From: Timo Sirainen <tss@iki.fi>
Date: Tue, 20 Jan 2009 17:31:58 +0000 (-0500)
Subject: mail_extra_groups backwards compatibility setting removed.
X-Git-Tag: 1.2.beta1~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=770d5738e9e3e7e65af6246272f1094f7a94fe35;p=thirdparty%2Fdovecot%2Fcore.git

mail_extra_groups backwards compatibility setting removed.

--HG--
branch : HEAD
---

diff --git a/src/master/master-settings-defs.c b/src/master/master-settings-defs.c
index fe4d0e2476..6d7e3bdb96 100644
--- a/src/master/master-settings-defs.c
+++ b/src/master/master-settings-defs.c
@@ -63,7 +63,6 @@ static struct setting_def setting_defs[] = {
 	DEF_INT(last_valid_uid),
 	DEF_INT(first_valid_gid),
 	DEF_INT(last_valid_gid),
-	DEF_STR(mail_extra_groups),
 	DEF_STR(mail_access_groups),
 	DEF_STR(mail_privileged_group),
 	DEF_STR(mail_uid),
diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index d832f3c8be..5cf9d51c06 100644
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -225,7 +225,6 @@ struct settings default_settings = {
 	MEMBER(last_valid_uid) 0,
 	MEMBER(first_valid_gid) 1,
 	MEMBER(last_valid_gid) 0,
-	MEMBER(mail_extra_groups) "",
 	MEMBER(mail_access_groups) "",
 	MEMBER(mail_privileged_group) "",
 	MEMBER(mail_uid) "",
@@ -801,21 +800,6 @@ static bool settings_verify(struct settings *set)
 			return FALSE;
 		}
 	}
-	if (*set->mail_extra_groups != '\0') {
-		if (*set->mail_access_groups != '\0') {
-			i_error("Can't set both mail_extra_groups "
-				"and mail_access_groups");
-			return FALSE;
-		}
-		if (!set->server->warned_mail_extra_groups) {
-			set->server->warned_mail_extra_groups = TRUE;
-			i_warning("mail_extra_groups setting was often used "
-				  "insecurely so it is now deprecated, "
-				  "use mail_access_groups or "
-				  "mail_privileged_group instead");
-		}
-		set->mail_access_groups = set->mail_extra_groups;
-	}
 
 	if (set->protocol != MAIL_PROTOCOL_ANY &&
 	    access(t_strcut(set->mail_executable, ' '), X_OK) < 0) {
diff --git a/src/master/master-settings.h b/src/master/master-settings.h
index 1e184def4d..9ffb981b1b 100644
--- a/src/master/master-settings.h
+++ b/src/master/master-settings.h
@@ -75,7 +75,6 @@ struct settings {
 
 	unsigned int first_valid_uid, last_valid_uid;
 	unsigned int first_valid_gid, last_valid_gid;
-	const char *mail_extra_groups;
 	const char *mail_access_groups;
 	const char *mail_privileged_group;
 	const char *mail_uid;
@@ -262,7 +261,6 @@ struct server_settings {
 	ARRAY_DEFINE(dicts, const char *);
 
 	gid_t login_gid;
-	unsigned int warned_mail_extra_groups:1;
 };
 
 extern struct server_settings *settings_root;