[Pkg-nagios-changes] [pkg-nagios-plugins] 138/413: allow empty ldap base

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit 5cc06623c7ff417dcae11968b6db9109c46d0a75
Author: Jan Wagner <waja at cyconet.org>
Date:   Fri Jun 6 11:47:27 2008 +0000

    allow empty ldap base
---
 debian/changelog                               |  3 +++
 debian/patches/00list                          |  1 +
 debian/patches/36_check_ldap_empty_base.dpatch | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3ab1214..a396f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,9 @@ nagios-plugins (1.4.12-1) UNRELEASED; urgency=low
     (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
diff --git a/debian/patches/00list b/debian/patches/00list
index fcaeb19..0492fda 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -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
diff --git a/debian/patches/36_check_ldap_empty_base.dpatch b/debian/patches/36_check_ldap_empty_base.dpatch
new file mode 100755
index 0000000..94e2411
--- /dev/null
+++ b/debian/patches/36_check_ldap_empty_base.dpatch
@@ -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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git