[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  031519c selftest: Fix plugin_s4_dc configuration.
      from  002694c s3 waf: Use upper case uselib_store parameter, otherwise the following checks won't find it

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 031519cec9ac341da706cabd9310f5543a59d98c
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 11 16:41:24 2011 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba3.pm |   32 +++++++++++++++++++++++++-------
 selftest/target/Samba4.pm |    1 +
 2 files changed, 26 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 203e764..c17455d 100755
--- 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 b356048..6f4b8fd 100644
--- 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...";


-- 
Samba Shared Repository