summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2010-04-11 11:28:02 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2010-04-11 11:28:02 +0200
commitce3de90c9ec8589b66412a7070d3bf15abc41b01 (patch)
tree45849b6ffcd6f1bb16bd37bb58772f50d3bd9cd5
parentaef79b7f411244385151880683651c884597e4eb (diff)
downloadmonitoring-plugins-ce3de90c9ec8589b66412a7070d3bf15abc41b01.tar.gz
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.)
-rw-r--r--NEWS1
-rw-r--r--plugins/check_ldap.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 7efebbd7..8ad698d4 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ This file documents the major additions and syntax changes between releases.
16 Fix regression in check_http ssl checks on some servers - make SNI an option 16 Fix regression in check_http ssl checks on some servers - make SNI an option
17 Fix guest mode support in check_disk_smb 17 Fix guest mode support in check_disk_smb
18 Fix check_disk_smb failure when run via ePN 18 Fix check_disk_smb failure when run via ePN
19 check_ldap now allows for specifying an empty LDAP base
19 WARNINGS 20 WARNINGS
20 Updated developer documentation to say that performance labels should not have an equals sign or 21 Updated developer documentation to say that performance labels should not have an equals sign or
21 single quote in the label 22 single quote in the label
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 49283946..400d74ad 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -374,7 +374,7 @@ validate_arguments ()
374 if (ld_host==NULL || strlen(ld_host)==0) 374 if (ld_host==NULL || strlen(ld_host)==0)
375 usage4 (_("Please specify the host name\n")); 375 usage4 (_("Please specify the host name\n"));
376 376
377 if (ld_base==NULL || strlen(ld_base)==0) 377 if (ld_base==NULL)
378 usage4 (_("Please specify the LDAP base\n")); 378 usage4 (_("Please specify the LDAP base\n"));
379 379
380 return OK; 380 return OK;