selftest: Disable implicit dollar match without canonicalization for promoted_dc

This puts promoted_dc and ad_dc_ntvfs in sync, and avoids an issue in the former
environment where the Heimdal KDC will use the smb.conf from one of the two DCs,
and the MIT KDC will use the smb.conf from the other.

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

diff --git a/selftest/knownfail_mit_kdc.d/krb5-kdc b/selftest/knownfail_mit_kdc.d/krb5-kdc
index 931376a602e1237275335df18a3d1c280c0f38b7..0265951eba8a0558ac5ee1b0c2ecaf4036f3647f 100644 (file)
--- a/selftest/knownfail_mit_kdc.d/krb5-kdc
+++ b/selftest/knownfail_mit_kdc.d/krb5-kdc
@@ -4,6 +4,4 @@
 ^samba4.krb5.kdc\ with\ account\ having\ identical\ UPN\ and\ SPN.canon.no-canon.no-enterprise.uc-user.spn.no-canon.no-enterprise.uc-user.spn\(promoted_dc\)
 ^samba4.krb5.kdc\ with\ account\ having\ identical\ UPN\ and\ SPN.canon.no-canon.no-enterprise.uc-user.upn.no-canon.no-enterprise.uc-user.upn\(promoted_dc\)
 ^samba4.krb5.kdc\ with\ machine\ account.canon.no-canon.no-enterprise.lc-user.removedollar.no-canon.no-enterprise.lc-user.removedollar\(fl2000dc:local\)
-^samba4.krb5.kdc\ with\ machine\ account.canon.no-canon.no-enterprise.lc-user.removedollar.no-canon.no-enterprise.lc-user.removedollar\(promoted_dc:local\)
 ^samba4.krb5.kdc\ with\ machine\ account.canon.no-canon.no-enterprise.uc-user.removedollar.no-canon.no-enterprise.uc-user.removedollar\(fl2000dc:local\)
-^samba4.krb5.kdc\ with\ machine\ account.canon.no-canon.no-enterprise.uc-user.removedollar.no-canon.no-enterprise.uc-user.removedollar\(promoted_dc:local\)

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 5c7ba9a074d16a7368392e2f103438c26c5996b6..af50e4d01ea98d6dba72d87f84d4a869c413961f 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1515,6 +1515,7 @@ sub provision_promoted_dc($$$)
         ntlm auth = ntlmv2-only
 
        kdc force enable rc4 weak session keys = yes
+       kdc name match implicit dollar without canonicalization = no
 
 [sysvol]
        path = $ctx->{statedir}/sysvol