From: Karl Fleischmann <karl.fleischmann@open-xchange.com>
Date: Wed, 1 Mar 2023 13:42:37 +0000 (+0100)
Subject: config: Deprecate imap_id_log setting
X-Git-Tag: 2.4.0~2831
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=422eec8af41f50da36b1ab4bad8f079c407fea71;p=thirdparty%2Fdovecot%2Fcore.git

config: Deprecate imap_id_log setting
---

diff --git a/doc/example-config/conf.d/20-imap.conf b/doc/example-config/conf.d/20-imap.conf
index e60b0cdf93..c92afdd154 100644
--- a/doc/example-config/conf.d/20-imap.conf
+++ b/doc/example-config/conf.d/20-imap.conf
@@ -47,9 +47,6 @@
 # revision.
 #imap_id_send = 
 
-# ID fields sent by client to log. * means everything.
-#imap_id_log =
-
 # Workarounds for various client bugs:
 #   delay-newmail:
 #     Send EXISTS/RECENT new mail notifications only when replying to NOOP
diff --git a/src/config/old-set-parser.c b/src/config/old-set-parser.c
index fa04c3578e..e93a51da4b 100644
--- a/src/config/old-set-parser.c
+++ b/src/config/old-set-parser.c
@@ -356,6 +356,12 @@ old_settings_handle_root(struct config_parser_context *ctx,
 					 value);
 		return TRUE;
 	}
+	if (strcmp(key, "imap_id_log") == 0) {
+		obsolete(ctx,
+			 "'imap_id_log' has been removed. Use event exporter "
+			 "for the 'imap_id_received' event instead.");
+		return TRUE;
+	}
 
 	return FALSE;
 }