summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-03-06 22:04:55 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-03-07 12:46:13 +0100
commit716a6c314c1d855b6e80850ffe7a8ca1ea4096d5 (patch)
tree764b1ce7aff1c54dc6e9a7c1b853084a4573ef9c
parent008648a034755d30900cce1ec04fba9ea18381c5 (diff)
downloadsamba-716a6c314c1d855b6e80850ffe7a8ca1ea4096d5.tar.gz
samba-716a6c314c1d855b6e80850ffe7a8ca1ea4096d5.tar.bz2
samba-716a6c314c1d855b6e80850ffe7a8ca1ea4096d5.zip
selftest: Only run s3dc with a forked lsasd
This ensures that we run ktest, member and s3member in the default configuration, to try and cover both code paths. (This does not change the tests being run, but at least the initialisation code will be checked, plus whatever the rpcclient test can cover). Andrew Bartlett
-rwxr-xr-xselftest/target/Samba3.pm22
1 files changed, 11 insertions, 11 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 797ae715bb..e9fa3fc1cc 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -188,6 +188,17 @@ sub setup_s3dc($$)
domain master = yes
domain logons = yes
lanman auth = yes
+
+ rpc_server:epmapper = external
+ rpc_server:spoolss = external
+ rpc_server:lsarpc = external
+ rpc_server:samr = external
+ rpc_server:netlogon = external
+ rpc_server:tcpip = yes
+
+ rpc_daemon:epmd = fork
+ rpc_daemon:spoolssd = fork
+ rpc_daemon:lsasd = fork
";
my $vars = $self->provision($path,
@@ -943,17 +954,6 @@ sub provision($$$$$$)
lpq cache time = 0
ncalrpc dir = $prefix_abs/ncalrpc
- rpc_server:epmapper = external
- rpc_server:spoolss = external
- rpc_server:lsarpc = external
- rpc_server:samr = external
- rpc_server:netlogon = external
- rpc_server:tcpip = yes
-
- rpc_daemon:epmd = fork
- rpc_daemon:spoolssd = fork
- rpc_daemon:lsasd = fork
-
resolv:host file = $dns_host_file
# The samba3.blackbox.smbclient_s3 test uses this to test that