| @@ -1,31 +1,6 @@
-From 0274b746e6350ac80b9b4d6a2c89543f4da621b9 Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg <sebastic@xs4all.nl>
-Date: Sat, 24 Dec 2016 13:29:57 +0100
-Subject: [PATCH] scape left brace in regex.
-
-Quoting perldelta:
-
-> A literal "{" should now be escaped in a pattern
->
-> If you want a literal left curly bracket (also called a left brace) in
-> a regular expression pattern, you should now escape it by either
-> preceding it with a backslash ("\{") or enclosing it within square
-> brackets "[{]", or by using \Q; otherwise a deprecation warning will be
-> raised. This was first announced as forthcoming in the v5.16 release;
-> it will allow future extensions to the language to happen.
-
-http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern
-
-Fixes #12
----
- plugins/check_multi.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/check_multi.in b/plugins/check_multi.in
-index 0be9ff0..4684798 100644
---- a/plugins/check_multi.in
-+++ b/plugins/check_multi.in
-@@ -1362,7 +1362,7 @@ sub parse_objects_cache {
+--- check_multi-0.26/plugins/check_multi.in.orig 2011-11-18 20:28:13.000000000 +0100
++++ check_multi-0.26/plugins/check_multi.in 2019-10-18 08:18:57.740468208 +0200
+@@ -1227,7 +1227,7 @@
}
while (<OBJECTS_CACHE>) {
#--- begin of object, determine type
@@ -34,3 +9,21 @@
$type="$1";
$typelist{$type}++;
$objectcount++;
+@@ -3217,7 +3217,7 @@
+
+ #--- some debugging first
+ DEBUG4("MULTI Environment (sorted):\n\t".join("\n\t",get_env_vars('^MULTI')));
+- DEBUG4("${NAGIOS} Environment (sorted):\n\t".join("\n\t",get_env_vars('^${NAGIOS}')));
++ DEBUG4("${NAGIOS} Environment (sorted):\n\t".join("\n\t",get_env_vars('^$\{NAGIOS}')));
+
+ #--- construction site for persistence
+ if ($opt{set}{test} && $opt{set}{persistent}) {
+@@ -4050,7 +4050,7 @@
+ }
+
+ $error.= "$label: bad value \'$value\' in data \'$data\' " if ($value && $value !~/^[-0-9.]+$/);
+- $error.= "$label: bad UOM \'$uom\' in data \'$data\' " if ($uom ne "" && ($uom!~/^[um]*s$/i && $uom!~/^%$/ && $uom!~/^[kmgt]*b$/i && $uom!~/^c$/i));
++ $error.= "$label: bad UOM \'$uom\' in data \'$data\' " if ($uom ne "" && ($uom!~/^[um]*s$/i && $uom!~/^%$/ && $uom!~/^[kmgt]?i*b$/i && $uom!~/^c$/i));
+ $error.= "$label: bad warning \'$warning\' in data \'$data\' " if ($warning && $warning !~/^[\@\~]?[-0-9.:]+$/);
+ $error.= "$label: bad critical \'$critical\' in data \'$data\' " if ($critical && $critical !~/^[\@\~]?[-0-9.:]+$/);
+ $error.= "$label: bad min \'$min\' in data \'$data\' " if ($min && $min !~/^[-0-9.]+$/);
|
