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

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 797ae715bbc44b450f9d34d9d1daea3128f67eac..e9fa3fc1cc48395164c6fd8601ba1659550d0207 100755 (executable)
--- 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