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.)

diff --git a/NEWS b/NEWS
index 7efebbd7f995aa9528be456d38883eb6eee58833..8ad698d4ef893a2fc4c1ec1e47cd492c17f3f98f 100644 (file)
--- 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
        WARNINGS
        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 492839468130b1fa54f7a093bcbdc8ef5b40a6f0..400d74ad7655f38bdba16a722b7b76e5076ab625 100644 (file)
--- 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;