r25914: selftest: fix the module pathes when using --with-selftest-prefix

metze
(This used to be commit 092b93b1356bbf73d40a1d7bb971a4ef4967d662)

diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index d0f6d522e987f3bc96d66e949fd11e2900aef133..d7c37fab3ea1a501a59ae6d111ca41450a708b9d 100644 (file)
--- a/source4/selftest/env/Samba4.pm
+++ b/source4/selftest/env/Samba4.pm
@@ -647,7 +647,6 @@ nogroup:x:65534:nobody
                DOMAIN => $domain,
                USERNAME => $username,
                REALM => $realm,
-               LDB_MODULES_PATH => "$self->{bindir}/modules/ldb",
                PASSWORD => $password,
                LDAPDIR => $ldapdir,
                WINBINDD_SOCKET_DIR => $winbindd_socket_dir,

diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index c84f1510435f7fbbda6ceae6e8f18c380b536896..2615390b9289a160e77699d926cdb39ec419af16 100755 (executable)
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -403,7 +403,7 @@ if (defined($ENV{RUN_FROM_BUILD_FARM}) and
 
 my $tls_enabled = not $opt_quick;
 $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
-$ENV{LD_LDB_MODULE_PATH} = "$old_pwd/bin/modules/ldb";
+$ENV{LDB_MODULE_PATH} = "$old_pwd/bin/modules/ldb";
 $ENV{LD_SAMBA_MODULE_PATH} = "$old_pwd/bin/modules";
 if (defined($ENV{LD_LIBRARY_PATH})) {
        $ENV{LD_LIBRARY_PATH} = "$old_pwd/bin/shared:$ENV{LD_LIBRARY_PATH}";
@@ -546,7 +546,7 @@ sub write_clientconf($$)
        torture:basedir = $prefix_abs/client
 #We don't want to pass our self-tests if the PAC code is wrong
        gensec:require_pac = true
-       modules dir = $prefix_abs/../bin/modules
+       modules dir = $ENV{LD_SAMBA_MODULE_PATH}
 ";
        close(CF);
 }