We don't care about plugin settings anymore, removed.

--HG--
branch : HEAD

diff --git a/src/master/mail-process.c b/src/master/mail-process.c
index 5e9d8f95a8daa0ac13226e60eb6983cb31203590..208e84b886b09aee90bc52f9a32196d2e89f95ea 100644 (file)
--- a/src/master/mail-process.c
+++ b/src/master/mail-process.c
@@ -209,8 +209,7 @@ get_var_expand_table(const char *protocol,
 static void mail_process_set_environment(struct master_settings *set)
 {
        /* we don't know all the settings, so since we can't expand all of
-          them just let the mail process expand all of them internally.
-          except for plugin settings - we know all of them so expand them. */
+          them just let the mail process expand all of them internally. */
        master_settings_export_to_env(set);
 
        (void)umask(set->umask);

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 8734812787fab220019cd2ccb0804f1884fb2179..ad72042b1fcacec7d4533039554ff1bd4b83940c 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -205,7 +205,6 @@ static struct setting_define master_setting_defines[] = {
        DEF(SET_UINT, dict_process_count),
        DEFLIST(auths, "auth", &master_auth_setting_parser_info),
        { SET_STRLIST, "dict", offsetof(struct master_settings, dicts), NULL },
-       { SET_STRLIST, "plugin", offsetof(struct master_settings, plugin_envs), NULL },
 
        SETTING_DEFINE_LIST_END
 };

diff --git a/src/master/master-settings.h b/src/master/master-settings.h
index 3b168dcf0c4ccf57ba35f12ba2a1cbbf8189feb1..15ec1d7c9dcac9abe8842f6e44fb905483ad41ad 100644 (file)
--- a/src/master/master-settings.h
+++ b/src/master/master-settings.h
@@ -116,7 +116,6 @@ struct master_settings {
        ARRAY_DEFINE(auths, struct master_auth_settings *);
 
        ARRAY_DEFINE(dicts, const char *);
-       ARRAY_DEFINE(plugin_envs, const char *);
 
 #ifndef CONFIG_BINARY
        /* .. */