tests/krb5: Get expected cname from TGT for TGS-REQ messages

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14642

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

diff --git a/python/samba/tests/krb5/fast_tests.py b/python/samba/tests/krb5/fast_tests.py
index 6f3738257b5bcb6a9ef5f5f785e38dd2e44546d1..bec3e26251817c5df9aa4926b37e37e4b6ec6120 100755 (executable)
--- a/python/samba/tests/krb5/fast_tests.py
+++ b/python/samba/tests/krb5/fast_tests.py
@@ -207,18 +207,12 @@ class FAST_Tests(KDCBaseTest):
         ])
 
     def test_simple_tgs_wrong_principal(self):
-        mach_creds = self.get_mach_creds()
-        mach_name = mach_creds.get_username()
-        expected_cname = self.PrincipalName_create(
-            name_type=NT_PRINCIPAL, names=[mach_name])
-
         self._run_test_sequence([
             {
                 'rep_type': KRB_TGS_REP,
                 'expected_error_mode': 0,
                 'use_fast': False,
-                'gen_tgt_fn': self.get_mach_tgt,
-                'expected_cname': expected_cname
+                'gen_tgt_fn': self.get_mach_tgt
             }
         ])
 
@@ -1236,7 +1230,12 @@ class FAST_Tests(KDCBaseTest):
             else:  # KRB_TGS_REP
                 srealm = target_realm
 
-            expected_cname = kdc_dict.pop('expected_cname', client_cname)
+            if rep_type == KRB_TGS_REP:
+                tgt_cname = tgt.cname
+            else:
+                tgt_cname = client_cname
+
+            expected_cname = kdc_dict.pop('expected_cname', tgt_cname)
             expected_anon = kdc_dict.pop('expected_anon',
                                          False)
             expected_crealm = kdc_dict.pop('expected_crealm', client_realm)