* (trunk,2.0)/

  lib/Smokeping/probes/LDAP.pm,
  CHANGES:
  + add the 'scope' Net::LDAP search option to the LDAP probe

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/Smokeping/probes/LDAP.pm b/lib/Smokeping/probes/LDAP.pm
index 2888a14..61d2957 100644
--- a/lib/Smokeping/probes/LDAP.pm
+++ b/lib/Smokeping/probes/LDAP.pm
@@ -145,6 +145,12 @@ sub targetvars {
 s.",
                         _re => '(\d*\.)?\d+',
                 },
+		scope => {
+			_doc => "The scope of the query. Can be either 'base', 'one' or 'sub'. See the Net::LDAP documentation for details.",
+			_example => "one",
+			_re => "(base|one|sub)",
+			_default => "sub",
+		},
 	});
 }
 
@@ -171,6 +177,8 @@ sub pingone {
 
 	my $timeout = $vars->{timeout};
 
+	my $scope = $vars->{scope};
+
 	my $password;
 	if (defined $binddn) {
 		$password = $self->password($host, $binddn);
@@ -203,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) 
+		my $ldap = new Net::LDAP($host, port => $port, version => $version, timeout => $timeout, scope => $scope) 
 			or do {
 				$self->do_log("connection error on $host: $!");
 				next;