summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-11-27 03:03:50 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-11-27 03:48:20 +0100
commit3483adaf0a66ddda30c828a478b859bd8270a2e5 (patch)
treefcb1b661651e632005c76471ec3f98fe10ab539c
parentdbb9500448ada04094db854aa81118d95cdc687a (diff)
downloadsamba-3483adaf0a66ddda30c828a478b859bd8270a2e5.tar.gz
samba-3483adaf0a66ddda30c828a478b859bd8270a2e5.tar.bz2
samba-3483adaf0a66ddda30c828a478b859bd8270a2e5.zip
selftest: Allow using ldb* utilities from system.
-rw-r--r--selftest/target/Samba4.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 3e42d034fa..12414f0307 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -9,6 +9,7 @@ use strict;
use Cwd qw(abs_path);
use FindBin qw($RealBin);
use POSIX;
+use SocketWrapper;
sub new($$$$$) {
my ($classname, $bindir, $ldap, $setupdir, $exeext) = @_;
@@ -27,7 +28,10 @@ sub new($$$$$) {
sub bindir_path($$) {
my ($self, $path) = @_;
- return "$self->{bindir}/$path$self->{exeext}";
+ my $valpath = "$self->{bindir}/$path$self->{exeext}";
+
+ return $valpath if (-f $valpath);
+ return $path;
}
sub openldap_start($$$) {