diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-03 17:32:55 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:00 +1100 |
| commit | b038aca5c869ba98f123f7107c3a6906c5f6bbdd (patch) | |
| tree | 0e8e14d3122de670f595e323bce01040170ab243 /selftest | |
| parent | b2a080fb1d9a726ad30ff7b745e7b77615ba1002 (diff) | |
| download | samba-b038aca5c869ba98f123f7107c3a6906c5f6bbdd.tar.gz samba-b038aca5c869ba98f123f7107c3a6906c5f6bbdd.tar.bz2 samba-b038aca5c869ba98f123f7107c3a6906c5f6bbdd.zip | |
s4-loadparm: removed "setup directory" option
the correct setup directory is known at both build time and install
time using dyn_SETUPDIR, so we no longer have any need to override it
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/selftest.pl | 1 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 3900ebbe33..4f1f1d422c 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -606,7 +606,6 @@ sub write_clientconf($$$) torture:basedir = $clientdir #We don't want to pass our self-tests if the PAC code is wrong gensec:require_pac = true - setup directory = ./setup resolv:host file = $prefix_abs/dns_host_file #We don't want to run 'speed' tests for very long torture:timelimit = 1 diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index a6e2ece705..d4817bb5c7 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -596,7 +596,6 @@ sub provision_raw_step1($$) pid directory = $ctx->{piddir} ncalrpc dir = $ctx->{ncalrpcdir} lock dir = $ctx->{lockdir} - setup directory = $self->{srcdir}/source4/setup winbindd socket directory = $ctx->{winbindd_socket_dir} winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir} ntp signd socket directory = $ctx->{ntp_signd_socket_dir} |