From: Timo Sirainen <tss@iki.fi>
Date: Wed, 26 Jun 2013 18:35:37 +0000 (+0300)
Subject: config: Give a somewhat better warning for when using protocols=imaps or pop3s.
X-Git-Tag: 2.2.5~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc4cb06efd149ff759ad5462c6cd1a352f735034;p=thirdparty%2Fdovecot%2Fcore.git

config: Give a somewhat better warning for when using protocols=imaps or pop3s.
---

diff --git a/src/config/old-set-parser.c b/src/config/old-set-parser.c
index db74545dcc..94d76b294e 100644
--- a/src/config/old-set-parser.c
+++ b/src/config/old-set-parser.c
@@ -104,14 +104,14 @@ old_settings_handle_root(struct config_parser_context *ctx,
 		value = t_strarray_join((const char *const *)protos, " ");
 
 		if (have_imaps && !have_imap) {
-			obsolete(ctx, "'imaps' protocol is no longer supported. to disable non-ssl imap, use service imap-login { inet_listener imap { port=0 } }");
+			obsolete(ctx, "'imaps' protocol can no longer be specified (use protocols=imap). to disable non-ssl imap, use service imap-login { inet_listener imap { port=0 } }");
 			value = t_strconcat(value, " imap", NULL);
 			config_apply_line(ctx, "port",
 				"service/imap-login/inet_listener/imap/port=0", NULL);
 		} else if (have_imaps)
 			obsolete(ctx, "'imaps' protocol is no longer necessary, remove it");
 		if (have_pop3s && !have_pop3) {
-			obsolete(ctx, "'pop3s' protocol is no longer supported. to disable non-ssl pop3, use service pop3-login { inet_listener pop3 { port=0 } }");
+			obsolete(ctx, "'pop3s' protocol can no longer be specified (use protocols=pop3). to disable non-ssl pop3, use service pop3-login { inet_listener pop3 { port=0 } }");
 			value = t_strconcat(value, " pop3", NULL);
 			config_apply_line(ctx, "port",
 				"service/pop3-login/inet_listener/pop3/port=0", NULL);