summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2010-04-11 09:39:24 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2010-04-11 09:39:24 +0200
commite4613410033dc24d9efe34013c8a35b16487af8f (patch)
tree17eb5ef14f30d2c6fcb4086839249867894df3f3
parent4bf27452ab4bffbfbf6597e0c74c7f1529d10e54 (diff)
downloadmonitoring-plugins-e4613410033dc24d9efe34013c8a35b16487af8f.tar.gz
Fix Debian bug #425129: SMB guest mode won't work
| The check_disk_smb plugin purports to support guest users, but it | doesn't work out, because it doesn't specify the -N command line | option to smbclient when no password is specified, making smbclient | stop and ask. [ http://bugs.debian.org/425129 ] (Fixed by Josip Rodin, forwarded by Jan Wagner.)
-rw-r--r--NEWS1
-rw-r--r--THANKS.in1
-rwxr-xr-xplugins-scripts/check_disk_smb.pl1
3 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 0d05019e..5827db69 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ This file documents the major additions and syntax changes between releases.
14 Fix compilation with GCC 2.96 (Konstantin Khomoutov - #2977105) 14 Fix compilation with GCC 2.96 (Konstantin Khomoutov - #2977105)
15 Fix regression introduced in #1867716 where partially valid performance strings would not be printed anymore 15 Fix regression introduced in #1867716 where partially valid performance strings would not be printed anymore
16 Fix regression in check_http ssl checks on some servers - make SNI an option 16 Fix regression in check_http ssl checks on some servers - make SNI an option
17 Fix guest mode support in check_disk_smb
17 WARNINGS 18 WARNINGS
18 Updated developer documentation to say that performance labels should not have an equals sign or 19 Updated developer documentation to say that performance labels should not have an equals sign or
19 single quote in the label 20 single quote in the label
diff --git a/THANKS.in b/THANKS.in
index 16036222..ee75f33a 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -260,3 +260,4 @@ Marcel Kuiper
260Bryan Irvine 260Bryan Irvine
261Jimmy Bergman 261Jimmy Bergman
262Konstantin Khomoutov 262Konstantin Khomoutov
263Josip Rodin
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 985fa961..022fa505 100755
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -78,6 +78,7 @@ my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]+)$/);
78 78
79($opt_p) || ($opt_p = shift) || ($opt_p = ""); 79($opt_p) || ($opt_p = shift) || ($opt_p = "");
80my $pass = $1 if ($opt_p =~ /(.*)/); 80my $pass = $1 if ($opt_p =~ /(.*)/);
81$pass = "-N" if ($opt_p eq "");
81 82
82($opt_w) || ($opt_w = shift) || ($opt_w = 85); 83($opt_w) || ($opt_w = shift) || ($opt_w = 85);
83my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/); 84my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/);