summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--lib/Smokeping/probes/LDAP.pm5
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 0a26fd5..95e7525 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-
+* make the LDAP probe 'scope' option actually work. -- niko
* some touchups to the graph comments to be a bit less 'ping' focussed -- tobi
* configuration option mailtemplate lets you configure the alert message content -- tobi
* added new method ProbeUnit to base.pm in support of FTPtransfer.pm -- tobi
diff --git a/lib/Smokeping/probes/LDAP.pm b/lib/Smokeping/probes/LDAP.pm
index 61d2957..a67e4a8 100644
--- a/lib/Smokeping/probes/LDAP.pm
+++ b/lib/Smokeping/probes/LDAP.pm
@@ -211,7 +211,7 @@ sub pingone {
}
local $IO::Socket::SSL::SSL_Context_obj; # ugly but necessary
$start = gettimeofday();
- my $ldap = new Net::LDAP($host, port => $port, version => $version, timeout => $timeout, scope => $scope)
+ my $ldap = new Net::LDAP($host, port => $port, version => $version, timeout => $timeout)
or do {
$self->do_log("connection error on $host: $!");
next;
@@ -238,7 +238,8 @@ sub pingone {
$ldap->unbind;
next;
};
- $mesg = $ldap->search(base => $base, filter => $filter, attrs => $attrsref);
+ $mesg = $ldap->search(base => $base, filter => $filter,
+ attrs => $attrsref, scope => $scope);
$mesg->code and do {
$self->do_log("filter error on $host: " . $mesg->error);
$ldap->unbind;