[checkmk-commits] 3370 FIX check_mail: Fixed mail parsing bug when using POP3

Module: check_mk Branch: master Commit: e050c7661bdcb273043e26ac21e9a6c51e7da6ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e050c7661bdcb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 15:18:00 2016 +0200 3370 FIX check_mail: Fixed mail parsing bug when using POP3 --- .werks/3370 | 10 ++++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_mail | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3370 b/.werks/3370 new file mode 100644 index 0000000..11d9a09 --- /dev/null +++ b/.werks/3370 @@ -0,0 +1,10 @@ +Title: check_mail: Fixed mail parsing bug when using POP3 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459948670 + + diff --git a/ChangeLog b/ChangeLog index 3f2770d..592535a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 3323 FIX: kernel.util: fix graph template in case steal is present but guest not * 3367 FIX: nginx_status: Fixed local instance detection for IPv6 loopback address * 3368 FIX: Fixed regression since 1.2.8b9 which broke all SNMP checks with Nagios core + * 3370 FIX: check_mail: Fixed mail parsing bug when using POP3 Multisite: * 3187 notification view: new filter for log command via regex diff --git a/doc/treasures/active_checks/check_mail b/doc/treasures/active_checks/check_mail index 6592aa2..306a07e 100755 --- a/doc/treasures/active_checks/check_mail +++ b/doc/treasures/active_checks/check_mail @@ -208,7 +208,7 @@ def fetch_mails(): for i in range(num_messages): index = i+1 lines = g_M.retr(index)[1] - mails[i] = email.message_from_string("".join(lines)) + mails[i] = email.message_from_string("\n".join(lines)) else: retcode, messages = g_M.search(None, 'NOT', 'DELETED') if retcode == 'OK' and messages[0].strip():