[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue May 24 16:36:03 UTC 2016
The branch, master has been updated
via 6de656b selftest: use the default values for "server signing"
via ca33674 s3:selftest: run test_smbclient_ntlm also against ad_dc
from de2bc19 selftest: systematize formatting of if/elseif/else indentation in cleanup_child
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6de656b8f1813dbc64eb648437f86b9490f9363d
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jul 15 11:10:24 2015 +0200
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 <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue May 24 18:35:19 CEST 2016 on sn-devel-144
commit ca33674e2c02e6e710a9689317fa12ce7567789c
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed May 18 10:24:36 2016 +0200
s3:selftest: run test_smbclient_ntlm also against ad_dc
This makes sure anonymous connections work if the server
requires signing.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11910
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
selftest/knownfail | 3 +++
selftest/target/Samba3.pm | 4 ----
selftest/target/Samba4.pm | 8 +++-----
source3/selftest/tests.py | 2 +-
4 files changed, 7 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail b/selftest/knownfail
index 59aba84..2f2d6bf 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 40b8d298..7a67e77 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 6daa6b2..3ac131c 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
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index ddea77c..b96df8a 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -129,7 +129,7 @@ for options in ["--option=clientusespnego=no", " --option=clientntlmv2auth=no --
env = "nt4_dc"
plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) %s" % (env, options), env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient3, configuration, options])
-for env in ["nt4_dc", "nt4_member", "ad_member", "ad_dc_ntvfs", "s4member", "fl2000dc"]:
+for env in ["nt4_dc", "nt4_member", "ad_member", "ad_dc", "ad_dc_ntvfs", "s4member", "fl2000dc"]:
plantestsuite("samba3.blackbox.smbclient_machine_auth.plain (%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_machine_auth.sh"), '$SERVER', smbclient3, configuration])
plantestsuite("samba3.blackbox.smbclient_ntlm.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_ntlm.sh"), '$SERVER', '$DC_USERNAME', '$DC_PASSWORD', "never", smbclient3, configuration])
--
Samba Shared Repository
More information about the samba-cvs
mailing list