summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl DeBisschop <kdebisschop@users.sourceforge.net>2003-02-20 03:16:26 (GMT)
committerKarl DeBisschop <kdebisschop@users.sourceforge.net>2003-02-20 03:16:26 (GMT)
commit82d729563fcb40498248248f05829d22ba58dd2d (patch)
tree8a6df5c6a123906a8523bfc316966e384d322c93
parentd574bcffa05710790ea9e369aab939452c08e2f5 (diff)
downloadmonitoring-plugins-c62b922ecb345f147252853ebf2bae330ce41b91.tar.gz
option regexs need to include ^ and $r1_3_0-beta3
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@348 f882894a-f735-0410-b71e-b25c423dba1c
-rwxr-xr-xplugins-scripts/check_disk_smb.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index c3f33ed..870e4e7 100755
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -64,26 +64,26 @@ my $smbclientoptions="";
64# Options checking 64# Options checking
65 65
66($opt_H) || ($opt_H = shift) || usage("Host name not specified\n"); 66($opt_H) || ($opt_H = shift) || usage("Host name not specified\n");
67my $host = $1 if ($opt_H =~ /([-_.A-Za-z0-9]+\$?)/); 67my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9]+\$?)$/);
68($host) || usage("Invalid host: $opt_H\n"); 68($host) || usage("Invalid host: $opt_H\n");
69 69
70($opt_s) || ($opt_s = shift) || usage("Share volume not specified\n"); 70($opt_s) || ($opt_s = shift) || usage("Share volume not specified\n");
71my $share = $1 if ($opt_s =~ /([-_.A-Za-z0-9]+\$?)/); 71my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/);
72($share) || usage("Invalid share: $opt_s\n"); 72($share) || usage("Invalid share: $opt_s\n");
73 73
74($opt_u) || ($opt_u = shift) || ($opt_u = "guest"); 74($opt_u) || ($opt_u = shift) || ($opt_u = "guest");
75my $user = $1 if ($opt_u =~ /([-_.A-Za-z0-9\\]+)/); 75my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]+)$/);
76($user) || usage("Invalid user: $opt_u\n"); 76($user) || usage("Invalid user: $opt_u\n");
77 77
78($opt_p) || ($opt_p = shift) || ($opt_p = "guest"); 78($opt_p) || ($opt_p = shift) || ($opt_p = "guest");
79my $pass = $1 if ($opt_p =~ /(.*)/); 79my $pass = $1 if ($opt_p =~ /(.*)/);
80 80
81($opt_w) || ($opt_w = shift) || ($opt_w = 85); 81($opt_w) || ($opt_w = shift) || ($opt_w = 85);
82my $warn = $1 if ($opt_w =~ /([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])/); 82my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/);
83($warn) || usage("Invalid warning threshold: $opt_w\n"); 83($warn) || usage("Invalid warning threshold: $opt_w\n");
84 84
85($opt_c) || ($opt_c = shift) || ($opt_c = 95); 85($opt_c) || ($opt_c = shift) || ($opt_c = 95);
86my $crit = $1 if ($opt_c =~ /([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])/); 86my $crit = $1 if ($opt_c =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/);
87($crit) || usage("Invalid critical threshold: $opt_c\n"); 87($crit) || usage("Invalid critical threshold: $opt_c\n");
88 88
89# check if both warning and critical are percentage or size 89# check if both warning and critical are percentage or size