SQ selftest: add a one-way trust between SAMBA2000 and ADDOMAIN

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/selftest/knownfail.d/one-way-trusts b/selftest/knownfail.d/one-way-trusts
new file mode 100644 (file)
index 0000000..7cfdf77
--- /dev/null
+++ b/selftest/knownfail.d/one-way-trusts
@@ -0,0 +1,19 @@
+#
+# There's only a one-way trust between SAMBA2000 and ADDOMAIN,
+# were ADDOMAIN trusts SAMBA2000.
+^samba4.blackbox.kinit_trust.*Test.login.with.user.kerberos.ccache.*\(fl2000dc:local\)
+^samba4.blackbox.kinit_trust.*Test.login.with.kerberos.ccache\(fl2000dc:local\)
+^samba4.blackbox.kinit_trust.*check.time.with.kerberos.ccache\(fl2000dc:local\)
+^samba4.blackbox.kinit_trust.*Test.login.with.user.kerberos.lowercase.realm\(fl2000dc:local\)
+^samba4.blackbox.kinit_trust.*Test.login.with.user.kerberos.lowercase.realm.2\(fl2000dc:local\)
+^samba4.blackbox.kinit_trust.*wbinfo.ping.dc\(fl2000dc:local\)
+^samba4.blackbox.kinit_trust.*wbinfo.change.outgoing.trust.pw\(fl2000dc:local\)
+^samba4.blackbox.kinit_trust.*wbinfo.check.outgoing.trust.pw\(fl2000dc:local\)
+^samba4.blackbox.trust_ntlm.Test07.*with.ADDOMAIN.*Administrator%locDCpass1\(fl2000dc:local\)
+^samba4.blackbox.trust_ntlm.Test08.*with.ADDOM.SAMBA.EXAMPLE.COM.*Administrator%locDCpass1\(fl2000dc:local\)
+^samba4.blackbox.trust_ntlm.Test09.*with.Administrator@ADDOMAIN%locDCpass1\(fl2000dc:local\)
+^samba4.blackbox.trust_ntlm.Test10.*with.Administrator@ADDOM.SAMBA.EXAMPLE.COM%locDCpass1\(fl2000dc:local\)
+^samba4.blackbox.trust_utils.*validate.trust.default.both\(fl2000dc:local\)
+^samba4.blackbox.trust_utils.*validate.trust.default.local\(fl2000dc:local\)
+^samba4.blackbox.trust_utils.*validate.trust.reverse.both\(fl2000dc:local\)
+^samba4.blackbox.trust_utils.*namespaces.own.default\(fl2000dc:local\)

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 8fcd0fe69222e98ee1b30f257405c8d77cacb5f8..8eee72a81530d5285b0a69112e90828efc3f056a 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1505,6 +1505,7 @@ sub provision_fl2000dc($$)
        print "PROVISIONING DC WITH FOREST LEVEL 2000...\n";
        my $extra_conf_options = "
        spnego:simulate_w2k=yes
+       ntlmssp_client:force_old_spnego=yes
        ntlmssp_server:force_old_spnego=yes
 ";
        my $extra_provision_options = ["--use-ntvfs", "--base-schema=2008_R2"];

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 0afdc1fd9615fef473ae5b04667c3fc7f24b16f1..e4cf195fad27fff94489742a3aae8d3c2b5fdfcc 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -471,6 +471,7 @@ else:
 
 plantestsuite("samba4.blackbox.trust_ntlm", "fl2008r2dc:local", [os.path.join(bbdir, "test_trust_ntlm.sh"), '$SERVER_IP', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', 'forest', 'auto', 'NT_STATUS_LOGON_FAILURE'])
 plantestsuite("samba4.blackbox.trust_ntlm", "fl2003dc:local", [os.path.join(bbdir, "test_trust_ntlm.sh"), '$SERVER_IP', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', 'external', 'auto', 'NT_STATUS_LOGON_FAILURE'])
+plantestsuite("samba4.blackbox.trust_ntlm", "fl2000dc:local", [os.path.join(bbdir, "test_trust_ntlm.sh"), '$SERVER_IP', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', 'external', 'auto', 'NT_STATUS_LOGON_FAILURE'])
 plantestsuite("samba4.blackbox.trust_ntlm", "ad_member:local", [os.path.join(bbdir, "test_trust_ntlm.sh"), '$SERVER_IP', '$USERNAME', '$PASSWORD', '$SERVER', '$SERVER', '$DC_USERNAME', '$DC_PASSWORD', '$REALM', '$DOMAIN', 'member', 'auto', 'NT_STATUS_LOGON_FAILURE'])
 plantestsuite("samba4.blackbox.trust_ntlm", "nt4_member:local", [os.path.join(bbdir, "test_trust_ntlm.sh"), '$SERVER_IP', '$USERNAME', '$PASSWORD', '$SERVER', '$SERVER', '$DC_USERNAME', '$DC_PASSWORD', '$DOMAIN', '$DOMAIN', 'member', 'auto', 'NT_STATUS_LOGON_FAILURE'])