From 2b3ad8d331de6e06cfdf5116a202f3f4261ebae1 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Fri, 14 Feb 2014 05:04:59 +0100
Subject: accept all characters for service name

---
 check_load | 4 +---
 check_mem  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/check_load b/check_load
index 779b979..91063f4 100755
--- a/check_load
+++ b/check_load
@@ -146,9 +146,7 @@ for my $load (qw( load1 load5 load15 )) {
     }
 }
 
-if ($n->opts->s && $n->opts->s =~ m/(\w[\w\/]*\w)/) {
-    $ENV{'NAGIOS_PLUGIN'} = $1;
-}
+$ENV{'NAGIOS_PLUGIN'} = $1 if ($n->opts->s && $n->opts->s =~ m/^(.+)$/);
 
 my $domain = '';
 $domain = ('.' . $n->opts->d) if $n->opts->d;
diff --git a/check_mem b/check_mem
index 01288dd..31beef5 100755
--- a/check_mem
+++ b/check_mem
@@ -151,9 +151,7 @@ my (%warn, %crit);
 ($warn{'vm'}, $warn{'rss'}, $warn{'anon'}, $warn{'vml'}) = parse_thresholds($n->opts->w);
 ($crit{'vm'}, $crit{'rss'}, $crit{'anon'}, $crit{'vml'}) = parse_thresholds($n->opts->c);
 
-if ($n->opts->s && $n->opts->s =~ m/(\w[\w\/]*\w)/) {
-    $ENV{'NAGIOS_PLUGIN'} = $1;
-}
+$ENV{'NAGIOS_PLUGIN'} = $1 if ($n->opts->s && $n->opts->s =~ m/^(.+)$/);
 
 my $domain = '';
 $domain = ('.' . $n->opts->d) if $n->opts->d;
-- 
cgit v1.2.3-1-g7c22