From 4a2fc8b7e85554ac819e30b48d300550a9cced10 Mon Sep 17 00:00:00 2001 From: Jeff Potter Date: Sun, 25 Jun 2017 19:05:13 -0400 Subject: [PATCH 1/4] Include imap (port 143) in courier-auth ports imap was missing from the list of ports, preventing fail2ban from blocking connections on standard IMAP port 143. --- config/jail.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jail.conf b/config/jail.conf index 5a6c59e6..c9fb9475 100644 --- a/config/jail.conf +++ b/config/jail.conf @@ -622,7 +622,7 @@ logpath = /opt/kerio/mailserver/store/logs/security.log [courier-auth] -port = smtp,465,submission,imap3,imaps,pop3,pop3s +port = smtp,465,submission,imap,imap3,imaps,pop3,pop3s logpath = %(syslog_mail)s backend = %(syslog_backend)s From 9876dd44f93a0b012108ea1aceeccee21be03cb9 Mon Sep 17 00:00:00 2001 From: "Serg G. Brester" Date: Fri, 3 Nov 2017 13:43:33 +0100 Subject: [PATCH 2/4] replace port imap3 with imap everywhere, since imap3 is not a standard port and old rarely (if ever) used and missing on some systems (see gh-1942) --- config/jail.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/jail.conf b/config/jail.conf index c9fb9475..41cb3529 100644 --- a/config/jail.conf +++ b/config/jail.conf @@ -622,7 +622,7 @@ logpath = /opt/kerio/mailserver/store/logs/security.log [courier-auth] -port = smtp,465,submission,imap,imap3,imaps,pop3,pop3s +port = smtp,465,submission,imap,imaps,pop3,pop3s logpath = %(syslog_mail)s backend = %(syslog_backend)s @@ -630,7 +630,7 @@ backend = %(syslog_backend)s [postfix-sasl] filter = postfix[mode=auth] -port = smtp,465,submission,imap3,imaps,pop3,pop3s +port = smtp,465,submission,imap,imaps,pop3,pop3s # You might consider monitoring /var/log/mail.warn instead if you are # running postfix since it would provide the same log lines at the # "warn" level but overall at the smaller filesize. @@ -640,27 +640,27 @@ backend = %(postfix_backend)s [perdition] -port = imap3,imaps,pop3,pop3s +port = imap,imaps,pop3,pop3s logpath = %(syslog_mail)s backend = %(syslog_backend)s [squirrelmail] -port = smtp,465,submission,imap2,imap3,imaps,pop3,pop3s,http,https,socks +port = smtp,465,submission,imap,imap2,imaps,pop3,pop3s,http,https,socks logpath = /var/lib/squirrelmail/prefs/squirrelmail_access_log [cyrus-imap] -port = imap3,imaps +port = imap,imaps logpath = %(syslog_mail)s backend = %(syslog_backend)s [uwimap-auth] -port = imap3,imaps +port = imap,imaps logpath = %(syslog_mail)s backend = %(syslog_backend)s From 8b26fd27780ef4a211dfa312e99e6f69bf181c16 Mon Sep 17 00:00:00 2001 From: "Serg G. Brester" Date: Fri, 3 Nov 2017 13:54:40 +0100 Subject: [PATCH 3/4] Update ChangeLog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index f8995d3d..3ddd159c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,8 @@ ver. 0.10.2-dev-1 (2017/??/??) - development edition ports are enclosed in curly braces `{ }` in the `jail.local` etc. This may cause a double-brackets now. ### Fixes +* jail.conf: port `imap3` replace with `imap` everywhere, since imap3 is not a standard port and old rarely + (if ever) used and missing on some systems (e. g. debian stretch), see gh-1942. * action.d/pf.conf: - fixed syntax error in achnor definition (documentation, see gh-1919); - enclose ports in braces for multiport jails (see gh-1925); From 4d10c615c4ca95b1e29f3e2a394ad7922827a2f4 Mon Sep 17 00:00:00 2001 From: "Serg G. Brester" Date: Fri, 3 Nov 2017 14:05:17 +0100 Subject: [PATCH 4/4] Update ChangeLog typo --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ddd159c..c6115409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,8 +39,8 @@ ver. 0.10.2-dev-1 (2017/??/??) - development edition ports are enclosed in curly braces `{ }` in the `jail.local` etc. This may cause a double-brackets now. ### Fixes -* jail.conf: port `imap3` replace with `imap` everywhere, since imap3 is not a standard port and old rarely - (if ever) used and missing on some systems (e. g. debian stretch), see gh-1942. +* jail.conf: port `imap3` replaced with `imap` everywhere, since imap3 is not a standard port and old rarely + (if ever) used and can missing on some systems (e. g. debian stretch), see gh-1942. * action.d/pf.conf: - fixed syntax error in achnor definition (documentation, see gh-1919); - enclose ports in braces for multiport jails (see gh-1925);