dovecot-1.2: mail_extra_groups backwards compatibility setting r...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/d1954af8aa3b
changeset: 8665:d1954af8aa3b
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Jan 20 12:31:58 2009 -0500
description:
mail_extra_groups backwards compatibility setting removed.

diffstat:

3 files changed, 19 deletions(-)
src/master/master-settings-defs.c |    1 -
src/master/master-settings.c      |   16 ----------------
src/master/master-settings.h      |    2 --

diffs (63 lines):

diff -r 446775a31754 -r d1954af8aa3b src/master/master-settings-defs.c
--- a/src/master/master-settings-defs.c	Tue Jan 20 11:28:48 2009 -0500
+++ b/src/master/master-settings-defs.c	Tue Jan 20 12:31:58 2009 -0500
@@ -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 -r 446775a31754 -r d1954af8aa3b src/master/master-settings.c
--- a/src/master/master-settings.c	Tue Jan 20 11:28:48 2009 -0500
+++ b/src/master/master-settings.c	Tue Jan 20 12:31:58 2009 -0500
@@ -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 setti
 			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 -r 446775a31754 -r d1954af8aa3b src/master/master-settings.h
--- a/src/master/master-settings.h	Tue Jan 20 11:28:48 2009 -0500
+++ b/src/master/master-settings.h	Tue Jan 20 12:31:58 2009 -0500
@@ -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;