[Pkg-nagios-changes] [pkg-nagios] r1914 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

tags 601696 pending
tags 601699 pending
thanks

Author: waja
Date: 2010-11-30 11:50:44 +0000 (Tue, 30 Nov 2010)
New Revision: 1914

Added:
   nagios-plugins/trunk/debian/patches/10_check_disk_smb_spaces.dpatch
   nagios-plugins/trunk/debian/patches/11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
add patches for check_disk_smb

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2010-09-23 09:25:35 UTC (rev 1913)
+++ nagios-plugins/trunk/debian/changelog	2010-11-30 11:50:44 UTC (rev 1914)
@@ -1,6 +1,9 @@
 nagios-plugins (1.4.15-3) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Add 10_check_disk_smb_spaces.dpatch from upstream svn (Closes: #601699),
+    thanks to Adam Buchbinder
+  * Add 11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch from upstream svn
+    (Closes: #601696), thanks to Adam Buchbinder
 
  -- Jan Wagner <waja at cyconet.org>  Thu, 23 Sep 2010 11:24:55 +0200
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2010-09-23 09:25:35 UTC (rev 1913)
+++ nagios-plugins/trunk/debian/patches/00list	2010-11-30 11:50:44 UTC (rev 1914)
@@ -1,4 +1,6 @@
 01_subst.in.dpatch
 02_check_icmp_links.dpatch
+# commited upstream
 05_check_linux_raid_fix_striped.dpatch
-# commited upstream
+10_check_disk_smb_spaces.dpatch
+11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch

Added: nagios-plugins/trunk/debian/patches/10_check_disk_smb_spaces.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/10_check_disk_smb_spaces.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/10_check_disk_smb_spaces.dpatch	2010-11-30 11:50:44 UTC (rev 1914)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_check_disk_smb_spaces.dpatch by
+## Matthias Eble <psychotrahe at users.sourceforge.net>
+##
+## From 0892c4ac28c4c2e3b6275187f845813b4cd6d320 Mon Sep 17 00:00:00 2001
+## From: Matthias Eble <psychotrahe at users.sourceforge.net>
+## Date: Sun, 28 Nov 2010 21:35:59 +0100
+## Subject: [PATCH] Make check_disk_smb accept spaces in share names
+## (#990948, #1370031, Debian #601699)
+##
+## DP: Enables Support sharenames with spaces (http://bugs.debian.org/601699)
+## DP: Upstream bug is: http://sourceforge.net/tracker/?func=detail&aid=990948&group_id=29880&atid=397597
+
+ at DPATCH@
+
+diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
+index 7c81fc2..4698700 100755
+--- a/plugins-scripts/check_disk_smb.pl
++++ b/plugins-scripts/check_disk_smb.pl
+@@ -67,7 +67,7 @@ my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9 ]+\$?)$/);
+ ($host) || usage("Invalid host: $opt_H\n");
+ 
+ ($opt_s) || ($opt_s = shift @ARGV) || usage("Share volume not specified\n");
+-my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/);
++my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9 ]+\$?)$/);
+ ($share) || usage("Invalid share: $opt_s\n");
+ 
+ defined($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest");
+

Added: nagios-plugins/trunk/debian/patches/11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch	2010-11-30 11:50:44 UTC (rev 1914)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch by
+## Matthias Eble <psychotrahe at users.sourceforge.net>
+##
+## From 3c67c9cb60a4681a29e509fccbb333e0f6234f54 Mon Sep 17 00:00:00 2001
+## From: Matthias Eble <psychotrahe at users.sourceforge.net>
+## Date: Sun, 28 Nov 2010 21:43:48 +0100
+## Subject: [PATCH] check_disk_smb now handles NT_STATUS_ACCESS_DENIED properly
+## (Debian #601696)
+##
+## DP: Handles NT_STATUS_ACCESS_DENIED properly (http://bugs.debian.org/601696)
+
+ at DPATCH@
+
+diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
+index 4698700..6783543 100755
+--- a/plugins-scripts/check_disk_smb.pl
++++ b/plugins-scripts/check_disk_smb.pl
+@@ -239,7 +239,7 @@ if (/\s*(\d*) blocks of size (\d*)\. (\d*) blocks available/) {
+ 	$answer = "Result from smbclient not suitable\n";
+ 	$state = "UNKNOWN";
+ 	foreach (@lines) {
+-		if (/(Access denied|NT_STATUS_LOGON_FAILURE)/) {
++		if (/(Access denied|NT_STATUS_LOGON_FAILURE|NT_STATUS_ACCESS_DENIED)/) {
+ 			$answer = "Access Denied\n";
+ 			$state = "CRITICAL";
+ 			last;
+