Module: check_mk
Branch: master
Commit: e89b6bea3492dc62e5bb4f4f291816b11c4805c2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e89b6bea3492dc…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Sun Nov 27 13:22:53 2016 +0100
4074 FIX check_ftp: Fixed possible wrong service description caused by unintended use of
global variable
---
.werks/4074 | 10 ++++++++++
ChangeLog | 1 +
checks/check_ftp | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/4074 b/.werks/4074
new file mode 100644
index 0000000..6ad62b4
--- /dev/null
+++ b/.werks/4074
@@ -0,0 +1,10 @@
+Title: check_ftp: Fixed possible wrong service description caused by unintended use of
global variable
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.4.0i3
+Date: 1480249368
+
+
diff --git a/ChangeLog b/ChangeLog
index c0620ea..938124a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
* 4092 FIX: if.include: fixed wrong calculated number of interfaces which are up in
case of interface groups
* 4093 FIX: oracle_tablespaces: Werk 3907 broke the space calculation...
* 3942 FIX: rstcli: fixed previously failing check, changed check output to provide
more information...
+ * 4074 FIX: check_ftp: Fixed possible wrong service description caused by unintended
use of global variable
Multisite:
* 4070 Added a painter for the service check period
diff --git a/checks/check_ftp b/checks/check_ftp
index b3c0e34..1a7739b 100644
--- a/checks/check_ftp
+++ b/checks/check_ftp
@@ -73,7 +73,7 @@ def check_ftp_arguments(params):
def check_ftp_get_item(params):
if type(params) == tuple:
- return "FTP " + args[0]
+ return "FTP " + params[0]
else:
if "port" in params and params["port"] != 21:
return "FTP Port " + str(params["port"])