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

[Jan Wagner]

tags 479984 pending
thanks

Author: waja-guest
Date: 2008-06-06 11:47:27 +0000 (Fri, 06 Jun 2008)
New Revision: 1472

Added:
   nagios-plugins/trunk/debian/patches/36_check_ldap_empty_base.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
allow empty ldap base

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2008-06-06 11:12:38 UTC (rev 1471)
+++ nagios-plugins/trunk/debian/changelog	2008-06-06 11:47:27 UTC (rev 1472)
@@ -32,6 +32,9 @@
     (Closes: #478942)
   * add 35_check_http_date.dpatch which fixes date parsing of check_http,
     thanks Hilko Bengen <bengen at debian.org> for providing it (Closes: #460097)
+  * add 36_check_ldap_empty_base.dpatch which allows empty ldap base, thanks
+    to Stephane Chazelas <stephane at artesyncp.com> for providing it
+    (Closes: #479984)
 
   [ Alexander Wirt ]
   * Call smbclient with -N (supress password prompt) if no password is

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2008-06-06 11:12:38 UTC (rev 1471)
+++ nagios-plugins/trunk/debian/patches/00list	2008-06-06 11:47:27 UTC (rev 1472)
@@ -10,4 +10,5 @@
 33_fix_emb_check_disk_smb.dpatch
 34_fix_smbclient_check_disk_smb.dpatch
 35_check_http_date.dpatch
+36_check_ldap_empty_base.dpatch
 50_misc_typos.dpatch

Added: nagios-plugins/trunk/debian/patches/36_check_ldap_empty_base.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/36_check_ldap_empty_base.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/36_check_ldap_empty_base.dpatch	2008-06-06 11:47:27 UTC (rev 1472)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 36_check_ldap_empty_base.dpatch by Jan Wagner <waja at cyconet.org>
+## patch provided by Stephane Chazelas <stephane at artesyncp.com>
+##
+## DP: allow empty ldap base 
+
+ at DPATCH@
+diff -urNad nagios-plugins-1.4.12~/plugins/check_ldap.c nagios-plugins-1.4.12/plugins/check_ldap.c
+--- nagios-plugins-1.4.12~/plugins/check_ldap.c	2008-06-06 13:40:44.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_ldap.c	2008-06-06 13:42:02.000000000 +0200
+@@ -378,7 +378,7 @@
+ 	if (ld_host==NULL || strlen(ld_host)==0)
+ 		usage4 (_("Please specify the host name\n"));
+ 
+-	if (ld_base==NULL || strlen(ld_base)==0)
++	if (ld_base == NULL)
+ 		usage4 (_("Please specify the LDAP base\n"));
+ 
+ 	return OK;


Property changes on: nagios-plugins/trunk/debian/patches/36_check_ldap_empty_base.dpatch
___________________________________________________________________
Name: svn:executable
   + *