[nagiosplug] Fix Debian bug #479984: Allow empty LDAP base

Holger Weiss hweiss at users.sourceforge.net
Sun Apr 11 11:29:27 CEST 2010

 Module: nagiosplug
 Branch: master
 Commit: ce3de90c9ec8589b66412a7070d3bf15abc41b01
 Author: Holger Weiss <holger at zedat.fu-berlin.de>
   Date: Sun Apr 11 11:28:02 2010 +0200
    URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=ce3de90

Fix Debian bug #479984: Allow empty LDAP base

The check_ldap plugin did not allow for specifying an empty LDAP base.

See: http://bugs.debian.org/479984

(Fixed by Stephane Chazelas, forwarded by Jan Wagner.)


 NEWS                 |    1 +
 plugins/check_ldap.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 7efebbd..8ad698d 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ This file documents the major additions and syntax changes between releases.
 	Fix regression in check_http ssl checks on some servers - make SNI an option
 	Fix guest mode support in check_disk_smb
 	Fix check_disk_smb failure when run via ePN
+	check_ldap now allows for specifying an empty LDAP base
 	Updated developer documentation to say that performance labels should not have an equals sign or
 	single quote in the label
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 4928394..400d74a 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -374,7 +374,7 @@ validate_arguments ()
 	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;

More information about the Commits mailing list