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 fe4d0e247641dc67f8b07a8482b95e210f09a651..6d7e3bdb962ede9746ba0a97362341edc97e798e 100644 (file)
--- 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 d832f3c8bef33eb5ae2fea19d5752d500ab235e8..5cf9d51c069d8487dfa8816bd726317cdd4a7caf 100644 (file)
--- 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 1e184def4d95bfc02380df21686e25572eb1e0b5..9ffb981b1bee90e46cf520cb3f9991a4fdaa8a9b 100644 (file)
--- 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;