selftest: Fix plugin_s4_dc configuration.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Oct 12 13:50:10 CEST 2011 on sn-devel-104

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 203e7640983f085565bc8855b743c524b16c3c24..c17455d5a8d13f28b2b6ddf65adbf091314201f0 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -280,18 +280,36 @@ sub setup_plugin_s4_dc($$$$)
        my $plugin_s4_dc_options = "
         workgroup = $dcvars->{DOMAIN}
         realm = $dcvars->{REALM}
-        security=ads
+
+        security = ads
+        domain logons = yes
         passdb backend = samba4
         auth methods = guest samba4
-        domain logons = yes
-        rpc_server:epmapper = external
-        rpc_daemon:epmd = disabled
-        rpc_daemon:lsasd = disabled
-        rpc_server:tcpip = no
+        server signing = on
+
+        rpc_server:epmapper = disabled
+        rpc_server:rpcecho = disabled
+        rpc_server:dssetup = disabled
+        rpc_server:svctl = disabled
+        rpc_server:ntsvcs = disabled
+        rpc_server:eventlog = disabled
+        rpc_server:initshutdown = disabled
+
+        rpc_server:winreg = embedded
+        rpc_server:srvsvc = embedded
+        rpc_server:netdfs = embedded
+        rpc_server:wkssvc = embedded
+        rpc_server:spoolss = embedded
+
         rpc_server:lsarpc = external
         rpc_server:netlogon = external
         rpc_server:samr = external
-       server signing = on
+
+        rpc_daemon:epmd = disabled
+        rpc_daemon:lsasd = disabled
+        rpc_daemon:spoolssd = disabled
+
+        rpc_server:tcpip = no
 
 [IPC\$]
        vfs objects = dfs_samba4

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index b356048869f8f62c50931b75d27c3ff3c5e76d25..6f4b8fdc10f03c514afcf2719d2bd6926dadf874 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1274,6 +1274,7 @@ sub provision_plugin_s4_dc($$)
 
        my $extra_smbconf_options = "
 server services = -smb
+dcerpc endpoint servers = -unixinfo -rpcecho -spoolss -winreg -wkssvc -srvsvc
 ";
 
        print "PROVISIONING PLUGIN S4 DC...";