From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Fri, 3 Mar 2023 00:22:09 +0000 (+1300)
Subject: tests/krb5: Don't specify extra enctypes for the krbtgt
X-Git-Tag: talloc-2.4.1~1461
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53400a6dfebb748dde4fe90bb2a9f34c2b1905bf;p=thirdparty%2Fsamba.git

tests/krb5: Don't specify extra enctypes for the krbtgt

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/tests/krb5/claims_tests.py b/python/samba/tests/krb5/claims_tests.py
index 9f637acbafe..85ab04086cd 100755
--- a/python/samba/tests/krb5/claims_tests.py
+++ b/python/samba/tests/krb5/claims_tests.py
@@ -485,9 +485,13 @@ class ClaimsTests(KDCBaseTest):
                                 b'tgsarmor')
         armor_key = Krb5EncryptionKey(armor_key, None)
 
+        if to_krbtgt:
+            extra_enctypes = None
+        else:
+            extra_enctypes = security.KERB_ENCTYPE_COMPOUND_IDENTITY_SUPPORTED
         target_creds, sname = self.get_target(
             to_krbtgt,
-            extra_enctypes=security.KERB_ENCTYPE_COMPOUND_IDENTITY_SUPPORTED)
+            extra_enctypes=extra_enctypes)
         srealm = target_creds.get_realm()
 
         decryption_key = self.TicketDecryptionKey_from_creds(
@@ -588,9 +592,13 @@ class ClaimsTests(KDCBaseTest):
                                 b'tgsarmor')
         armor_key = Krb5EncryptionKey(armor_key, None)
 
+        if to_krbtgt:
+            extra_enctypes = None
+        else:
+            extra_enctypes = security.KERB_ENCTYPE_COMPOUND_IDENTITY_SUPPORTED
         target_creds, sname = self.get_target(
             to_krbtgt,
-            extra_enctypes=security.KERB_ENCTYPE_COMPOUND_IDENTITY_SUPPORTED)
+            extra_enctypes=extra_enctypes)
         srealm = target_creds.get_realm()
 
         decryption_key = self.TicketDecryptionKey_from_creds(
diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
index 3d9059b3510..9b528eba7f2 100644
--- a/python/samba/tests/krb5/kdc_base_test.py
+++ b/python/samba/tests/krb5/kdc_base_test.py
@@ -1854,6 +1854,9 @@ class KDCBaseTest(RawKerberosTest):
             self.assertIsNone(compression,
                               "it's no good specifying compression support "
                               "for the krbtgt")
+            self.assertFalse(extra_enctypes,
+                             "it's no good specifying extra enctypes "
+                             "for the krbtgt")
             creds = self.get_krbtgt_creds()
             sname = self.get_krbtgt_sname()
         else: