[checkmk-commits] Check_MK Git: check_mk: #2415 FIX check_mail, check_mail_loop:

fixed incorrect POP3 ssl setting (thanks to Bernhard Schmidt) Message-ID: <55bb6bd8.Axd+tfp6o970fKSW%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 527c77321a601d1e1230c7031c77f35993d95e22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=527c77321a601d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 31 14:35:50 2015 +0200 #2415 FIX check_mail, check_mail_loop: fixed incorrect POP3 ssl setting (thanks to Bernhard Schmidt) The logic in the POP3 WATO configuration is wrong, it sets ssl to True when "Use no encryption" is selected and to False when "Encrypt POP3 communication using SSL" is selected. --- .werks/2415 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/wato/active_checks.py | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/2415 b/.werks/2415 new file mode 100644 index 0000000..cc4855c --- /dev/null +++ b/.werks/2415 @@ -0,0 +1,12 @@ +Title: check_mail, check_mail_loop: fixed incorrect POP3 ssl setting (thanks to Bernhard Schmidt) +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438345949 + +The logic in the POP3 WATO configuration is wrong, it sets ssl to True +when "Use no encryption" is selected and to False when "Encrypt POP3 +communication using SSL" is selected. diff --git a/ChangeLog b/ChangeLog index bb78549..d1c3876 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 1276 FIX: brocade_mlx_temperature: Fixed the shown Temperature Values * 2490 FIX: synology_disks: treat SSDs with state "not initialized" as OK if state does not change later * 2414 FIX: logwatch: now really ignores ignored logwatch lines... + * 2415 FIX: check_mail, check_mail_loop: fixed incorrect POP3 ssl setting (thanks to Bernhard Schmidt)... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 59c72c9..309245b 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -135,7 +135,7 @@ mail_receiving_params = [ title = _('SSL Encryption'), default_value = (False, 110), choices = [ - (True, _('Use no encryption'), + (False, _('Use no encryption'), Optional(Integer( allow_empty = False, default_value = 110, @@ -143,7 +143,7 @@ mail_receiving_params = [ title = _('TCP Port'), help = _('By default the standard POP3 Port 110 is used.'), )), - (False, _('Encrypt POP3 communication using SSL'), + (True, _('Encrypt POP3 communication using SSL'), Optional(Integer( allow_empty = False, default_value = 995,