Module: check_mk
Branch: master
Commit: f19663292a90a8afa1751c46317566fb6e415975
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f19663292a90a8…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Nov 3 15:22:12 2015 +0100
#2446 FIX Active checks check_mail, check_mail_loop: did not work with POP3 protocol
Any mail checks through the POP3 protocol lead to an exception.
This has been fixed.
---
.werks/2446 | 11 +++++++++++
ChangeLog | 1 +
doc/treasures/active_checks/check_mail | 2 +-
doc/treasures/active_checks/check_mail_loop | 2 +-
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.werks/2446 b/.werks/2446
new file mode 100644
index 0000000..ce8140e
--- /dev/null
+++ b/.werks/2446
@@ -0,0 +1,11 @@
+Title: Active checks check_mail, check_mail_loop: did not work with POP3 protocol
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i4
+Date: 1446560378
+
+Any mail checks through the POP3 protocol lead to an exception.
+This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index 312d690..acb20d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@
* 2672 FIX: mounts: ignore options that are allowed to change on btrfs
filesystems...
* 2445 FIX: ibm_svc_disks: fixed crash in case special agent reports too much data
columns per line
* 2734 FIX: cmctc.temp: fix exception of type UnicodeDecodeError
+ * 2446 FIX: Active checks check_mail, check_mail_loop: did not work with POP3
protocol...
Multisite:
* 2684 Added icons for downloading agent data / walks of hosts...
diff --git a/doc/treasures/active_checks/check_mail
b/doc/treasures/active_checks/check_mail
index 7c2ccf6..8ef4a4a 100755
--- a/doc/treasures/active_checks/check_mail
+++ b/doc/treasures/active_checks/check_mail
@@ -207,7 +207,7 @@ def fetch_mails():
num_messages = len(g_M.list()[1])
for i in range(num_messages):
index = i+1
- lines = g_M.retr(index, 0)[1]
+ lines = g_M.retr(index)[1]
mails[i] = email.message_from_string("".join(lines))
else:
retcode, messages = g_M.search(None, 'NOT', 'DELETED')
diff --git a/doc/treasures/active_checks/check_mail_loop
b/doc/treasures/active_checks/check_mail_loop
index c1a0634..c9702ee 100755
--- a/doc/treasures/active_checks/check_mail_loop
+++ b/doc/treasures/active_checks/check_mail_loop
@@ -238,7 +238,7 @@ def fetch_mails():
for i in range(num_messages):
index = i+1
- lines = g_M.retr(index, 0)[1]
+ lines = g_M.retr(index)[1]
mails[i] = email.message_from_string("".join(lines))
else: