10 Apr
2015
10 Apr
'15
9:41 a.m.
Module: check_mk
Branch: master
Commit: 3c5d6f9422e92dd546c5bccf3629953ad3d14d3d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c5d6f9422e92d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Apr 10 09:41:11 2015 +0200
#2173 FIX mk-job: Fixed quoting of command line arguments
---
.werks/2173 | 10 ++++++++++
ChangeLog | 1 +
agents/mk-job | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/2173 b/.werks/2173
new file mode 100644
index 0000000..5dc9cfa
--- /dev/null
+++ b/.werks/2173
@@ -0,0 +1,10 @@
+Title: mk-job: Fixed quoting of command line arguments
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1428651655
+
+
diff --git a/ChangeLog b/ChangeLog
index 55b998a..bbf0cc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -314,6 +314,7 @@
* 2190 FIX: jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are
defined
* 2192 FIX: check_notify_count": Fix exception in PNP template in case of explit
email addresses...
* 2172 FIX: Allowing OIDs in checks not starting with a dot again...
+ * 2173 FIX: mk-job: Fixed quoting of command line arguments
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request,
added mailto link for error report...
diff --git a/agents/mk-job b/agents/mk-job
index 20a1fdf..1a4ae8b 100755
--- a/agents/mk-job
+++ b/agents/mk-job
@@ -63,7 +63,7 @@ fi
date +"start_time %s" > "$OUTPUT_PATH/$IDENT.running"
/usr/bin/time -o "$OUTPUT_PATH/$IDENT.running" --append \
- -f "exit_code %x\nreal_time %E\nuser_time %U\nsystem_time %S\nreads
%I\nwrites %O\nmax_res_kbytes %M\navg_mem_kbytes %K\ninvol_context_switches
%c\nvol_context_switches %w" $@
+ -f "exit_code %x\nreal_time %E\nuser_time %U\nsystem_time %S\nreads
%I\nwrites %O\nmax_res_kbytes %M\navg_mem_kbytes %K\ninvol_context_switches
%c\nvol_context_switches %w" "$@"
RC=$?
mv "$OUTPUT_PATH/$IDENT.running" "$OUTPUT_PATH/$IDENT"
exit $RC