#! /bin/sh /usr/share/dpatch/dpatch-run ## 32_check_ldap_pointer.dpatch by Jan Wagner ## patch provided by Stephane Chazelas ## ## DP: fix processing vi embedded perl interpreter @DPATCH@ diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl --- nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl 2008-06-06 11:57:33.000000000 +0200 +++ nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl 2008-06-06 11:58:03.000000000 +0200 @@ -65,27 +65,27 @@ # 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");