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 e60b0cdf9378299688e18787c3557bdd132f9464..c92afdd154ec03324378a589fc3cb23fc118d96f 100644 (file)
--- 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 fa04c3578ee9dc31cc499133d1a98960648a2e95..e93a51da4be9f508c732aed344bc412a4bc55c9b 100644 (file)
--- 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;
 }