From 6de656b8f1813dbc64eb648437f86b9490f9363d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 15 Jul 2015 11:10:24 +0200 Subject: [PATCH] selftest: use the default values for "server signing" That will hopefully catch possible regressions. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11910 Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Tue May 24 18:35:19 CEST 2016 on sn-devel-144 --- selftest/knownfail | 3 +++ selftest/target/Samba3.pm | 4 ---- selftest/target/Samba4.pm | 8 +++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/selftest/knownfail b/selftest/knownfail index 59aba84238b..2f2d6bffbae 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -327,3 +327,6 @@ # ^samba3.blackbox.rpcclient.*ncacn_np.*with.*connect.*rpcclient # we don't allow auth_level_connect anymore ^samba.tests.dns.__main__.TestComplexQueries.test_cname_two_chain_not_matching_qtype +# ad_dc requires signing +# +^samba4.smb.signing.*disabled.*signing=off.*\(ad_dc\) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 40b8d29853a..7a67e77b5c5 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -314,7 +314,6 @@ sub setup_nt4_member($$$) my $member_options = " security = domain - server signing = on dbwrap_tdb_mutexes:* = yes ${require_mutexes} "; @@ -379,7 +378,6 @@ sub setup_admember($$$$) my $member_options = " security = ads - server signing = on workgroup = $dcvars->{DOMAIN} realm = $dcvars->{REALM} "; @@ -463,7 +461,6 @@ sub setup_admember_rfc2307($$$$) my $member_options = " security = ads - server signing = on workgroup = $dcvars->{DOMAIN} realm = $dcvars->{REALM} idmap config $dcvars->{DOMAIN} : backend = rfc2307 @@ -1415,7 +1412,6 @@ sub provision($$$$$$$$) # min receivefile size = 4000 read only = no - server signing = auto smbd:sharedelay = 100000 smbd:writetimeupdatedelay = 500000 diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 6daa6b2c94d..3ac131c70d6 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -568,10 +568,6 @@ sub provision_raw_step1($$) vfs objects = dfs_samba4 acl_xattr fake_acls xattr_tdb streams_depot - # remove this again, when our smb2 client library - # supports signin on compound related requests - server signing = on - idmap_ldb:use rfc2307=yes winbind enum users = yes winbind enum groups = yes @@ -949,6 +945,9 @@ sub provision_s4member($$$) passdb backend = samba_dsdb winbindd:use external pipes = true +# the source4 smb server doesn't allow signing by default +server signing = enabled + rpc_server:default = external rpc_server:svcctl = embedded rpc_server:srvsvc = embedded @@ -1638,7 +1637,6 @@ sub provision_ad_dc($$) max protocol = SMB3 read only = no - server signing = auto smbd:sharedelay = 100000 smbd:writetimeupdatedelay = 500000 -- 2.34.1