tests: run krb5.kdc tests on ad_dc_ntvfs without implicit dollar match

that is, with "kdc name match with implicit dollar = no"

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>

diff --git a/selftest/knownfail.d/krb5-no-dollar b/selftest/knownfail.d/krb5-no-dollar
new file mode 100644 (file)
index 0000000..278493e
--- /dev/null
+++ b/selftest/knownfail.d/krb5-no-dollar
@@ -0,0 +1,6 @@
+^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_enterprise_principal_step_6_a\(ad_dc_ntvfs\)
+^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_enterprise_principal_step_6_b\(ad_dc_ntvfs\)
+^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_principal_step_4_a\(ad_dc_ntvfs\)
+^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_principal_step_4_b\(ad_dc_ntvfs\)
+^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_principal_step_4_c\(ad_dc_ntvfs\)
+^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_principal_step_6_c\(ad_dc_ntvfs\)

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 04d60f332cbe030a835d7cea27f8ee486fc73173..14bca5772e6bcbdaeb32f61c1b548172d8c50a55 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1646,6 +1646,7 @@ sub provision_ad_dc_ntvfs($$$)
        # override the new SMB2 only default
        client min protocol = CORE
        server min protocol = LANMAN1
+       kdc name match implicit dollar without canonicalization = no
 
        server support krb5 netlogon = yes
        CVE_2020_1472:warn_about_unused_debug_level = 3

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 1675112cc1b4ba832b78c0ff2a0acfa161b746f5..7c9b1aee37b9aabb91eedfee82851396c8f87ee2 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -2063,6 +2063,29 @@ for env in ["rodc", "promoted_dc", "fl2000dc", "fl2008r2dc"]:
                                                             '--option=torture:expect_machine_account=true'] + extra_options,
                              "samba4.krb5.kdc with machine account")
 
+
+plansmbtorture4testsuite('krb5.kdc', "ad_dc_ntvfs:local",
+                         ['ncacn_np:$SERVER_IP', "-k", "yes", '-P',
+                          '--workgroup=$DOMAIN', '--realm=$REALM',
+                          '--option=torture:krb5-hostname=$SERVER',
+                          '--option=torture:run_removedollar_test=true',
+                          '--option=torture:expect_machine_account=true'] + extra_options,
+                         "samba4.krb5.kdc with machine account no dollar extension")
+
+planpythontestsuite(
+    "ad_dc_ntvfs",
+    "samba.tests.krb5.ms_kile_client_principal_lookup_tests",
+    environ=krb5_environ)
+planpythontestsuite(
+    "ad_dc_ntvfs",
+    "samba.tests.krb5.spn_tests",
+    environ=krb5_environ)
+planpythontestsuite(
+    "ad_dc_ntvfs",
+    "samba.tests.krb5.alias_tests",
+    environ=krb5_environ)
+
+
 planpythontestsuite("ad_dc", "samba.tests.krb5.as_canonicalization_tests",
                     environ=krb5_environ)
 for env, fast_support in [("ad_dc", True),