From 6144d6045faa7fc417088e3d679a1ae755a50095 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 12 Mar 2025 17:51:44 +0200
Subject: [PATCH] global: Make process_shutdown_filter specific to
 imap/pop3/submission

---
 src/imap/imap-settings.c                 | 3 +++
 src/lib-master/master-service-settings.c | 4 ----
 src/pop3/pop3-settings.c                 | 8 ++++++++
 src/submission/submission-settings.c     | 8 ++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index b20cfbf456..aa0cd747cb 100644
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -172,6 +172,9 @@ static const struct setting_keyvalue imap_default_settings_keyvalue[] = {
 	{ "service/imap/imap_capability/LITERAL+", "yes" },
 	{ "service/imap/imap_capability/LITERAL-", "yes" },
 	{ "service/imap/imap_capability/UTF8=ACCEPT", "yes" },
+#ifdef DOVECOT_PRO_EDITION
+	{ "service/imap/process_shutdown_filter", "event=mail_user_session_finished AND rss > 20MB" },
+#endif
 	{ "imap_id_send/name", DOVECOT_NAME },
 	{ NULL, NULL },
 };
diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index cdcdd397a1..399d753ad7 100644
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -70,11 +70,7 @@ static const struct master_service_settings master_service_default_settings = {
 	.log_timestamp = DEFAULT_FAILURE_STAMP_FORMAT,
 	.log_debug = "",
 	.log_core_filter = "",
-#ifdef DOVECOT_PRO_EDITION
-	.process_shutdown_filter = "event=mail_user_session_finished AND rss > 20MB",
-#else
 	.process_shutdown_filter = "",
-#endif
 	.syslog_facility = "mail",
 	.import_environment = ARRAY_INIT,
 	.stats_writer_socket_path = "stats-writer",
diff --git a/src/pop3/pop3-settings.c b/src/pop3/pop3-settings.c
index 8cf3921e76..3dc5f09fda 100644
--- a/src/pop3/pop3-settings.c
+++ b/src/pop3/pop3-settings.c
@@ -98,11 +98,19 @@ static const struct pop3_settings pop3_default_settings = {
 	.pop3_delete_type = "default:expunge:flag"
 };
 
+static const struct setting_keyvalue pop3_default_settings_keyvalue[] = {
+#ifdef DOVECOT_PRO_EDITION
+	{ "service/pop3/process_shutdown_filter", "event=mail_user_session_finished AND rss > 20MB" },
+#endif
+	{ NULL, NULL },
+};
+
 const struct setting_parser_info pop3_setting_parser_info = {
 	.name = "pop3",
 
 	.defines = pop3_setting_defines,
 	.defaults = &pop3_default_settings,
+	.default_settings = pop3_default_settings_keyvalue,
 
 	.struct_size = sizeof(struct pop3_settings),
 	.pool_offset1 = 1 + offsetof(struct pop3_settings, pool),
diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c
index 6176025a92..6f3d979a59 100644
--- a/src/submission/submission-settings.c
+++ b/src/submission/submission-settings.c
@@ -142,11 +142,19 @@ static const struct submission_settings submission_default_settings = {
 	.imap_urlauth_port = 143,
 };
 
+static const struct setting_keyvalue submission_default_settings_keyvalue[] = {
+#ifdef DOVECOT_PRO_EDITION
+	{ "service/submission/process_shutdown_filter", "event=mail_user_session_finished AND rss > 20MB" },
+#endif
+	{ NULL, NULL },
+};
+
 const struct setting_parser_info submission_setting_parser_info = {
 	.name = "submission",
 
 	.defines = submission_setting_defines,
 	.defaults = &submission_default_settings,
+	.default_settings = submission_default_settings_keyvalue,
 
 	.struct_size = sizeof(struct submission_settings),
 	.pool_offset1 = 1 + offsetof(struct submission_settings, pool),
-- 
2.47.3