diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-11-09 18:33:18 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:44:53 +0100 |
| commit | 3953335420f95c7ac60cd2cbfde7427a6d5b0922 (patch) | |
| tree | 730f7452960485d0a6f1aa94083f2991d452db54 | |
| parent | e8b921293bffe7682180681f5416c7bea80ec9e1 (diff) | |
| download | samba-3953335420f95c7ac60cd2cbfde7427a6d5b0922.tar.gz samba-3953335420f95c7ac60cd2cbfde7427a6d5b0922.tar.bz2 samba-3953335420f95c7ac60cd2cbfde7427a6d5b0922.zip | |
r25914: selftest: fix the module pathes when using --with-selftest-prefix
metze
(This used to be commit 092b93b1356bbf73d40a1d7bb971a4ef4967d662)
| -rw-r--r-- | source4/selftest/env/Samba4.pm | 1 | ||||
| -rwxr-xr-x | source4/selftest/selftest.pl | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm index d0f6d522e9..d7c37fab3e 100644 --- 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 c84f151043..2615390b92 100755 --- 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); } |