From de7191e3424e02ba278a39b86e8b1906a25d0362 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Sun, 11 Apr 2010 09:54:10 +0200 Subject: Fix Debian bug #478906: Failure when run via ePN | When perl plugin scripts are run with the embedded perl interpreter in | nagios3, the "shift" perl command doesn't shift @ARGV, but @_ (which | happens to contain the same thing as @ARGV at the time the script was | started). | | [...] | | A fix is to replace all the instances of "shift" with "shift @ARGV". [ http://bugs.debian.org/478906 ] (Fixed by Stephane Chazelas, forwarded by Jan Wagner.) --- plugins-scripts/check_disk_smb.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins-scripts') diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl index 022fa505..ca593d46 100755 --- a/plugins-scripts/check_disk_smb.pl +++ b/plugins-scripts/check_disk_smb.pl @@ -64,27 +64,27 @@ my $smbclientoptions= $opt_P ? "-p $opt_P " : ""; # Options checking -($opt_H) || ($opt_H = shift) || usage("Host name not specified\n"); +($opt_H) || ($opt_H = shift @ARGV) || usage("Host name not specified\n"); my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9 ]+\$?)$/); ($host) || usage("Invalid host: $opt_H\n"); -($opt_s) || ($opt_s = shift) || usage("Share volume not specified\n"); +($opt_s) || ($opt_s = shift @ARGV) || usage("Share volume not specified\n"); my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/); ($share) || usage("Invalid share: $opt_s\n"); -($opt_u) || ($opt_u = shift) || ($opt_u = "guest"); +($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest"); my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]+)$/); ($user) || usage("Invalid user: $opt_u\n"); -($opt_p) || ($opt_p = shift) || ($opt_p = ""); +($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = ""); my $pass = $1 if ($opt_p =~ /(.*)/); $pass = "-N" if ($opt_p eq ""); -($opt_w) || ($opt_w = shift) || ($opt_w = 85); +($opt_w) || ($opt_w = shift @ARGV) || ($opt_w = 85); my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/); ($warn) || usage("Invalid warning threshold: $opt_w\n"); -($opt_c) || ($opt_c = shift) || ($opt_c = 95); +($opt_c) || ($opt_c = shift @ARGV) || ($opt_c = 95); my $crit = $1 if ($opt_c =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/); ($crit) || usage("Invalid critical threshold: $opt_c\n"); -- cgit v1.2.3-74-g34f1