mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
r25914: selftest: fix the module pathes when using --with-selftest-prefix
metze
This commit is contained in:
1
source/selftest/env/Samba4.pm
vendored
1
source/selftest/env/Samba4.pm
vendored
@ -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,
|
||||
|
@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user