python:tests/krb5: allow set_pac_sids() to take upn_dns_sid

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
index fac9dedbe07b6fa6908767d9de05acc72445539d..2022d9bfe8f48edc3adcb495a74632a08943d02b 100644 (file)
--- a/python/samba/tests/krb5/kdc_base_test.py
+++ b/python/samba/tests/krb5/kdc_base_test.py
@@ -2022,6 +2022,7 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
                      new_sids,
                      domain_sid=None,
                      user_rid=None,
+                     upn_dns_sid=None,
                      requester_sid=None,
                      set_user_flags=0,
                      reset_user_flags=0):
@@ -2146,10 +2147,13 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
             elif pac_buffer.type == krb5pac.PAC_TYPE_UPN_DNS_INFO:
                 upn_dns_info_ex = pac_buffer.info.ex
 
-                if user_rid is not None:
-                    upn_dns_info_ex.objectsid = security.dom_sid(
+                if upn_dns_sid is None and user_rid is not None:
+                    upn_dns_sid = security.dom_sid(
                         f'{domain_sid}-{user_rid}')
 
+                if upn_dns_sid is not None:
+                    upn_dns_info_ex.objectsid = upn_dns_sid
+
             elif pac_buffer.type == krb5pac.PAC_TYPE_REQUESTER_SID:
                 if requester_sid is not None:
                     pac_buffer.info.sid = requester_sid