tests/krb5: Allow specifying the UPN for test accounts

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

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
index 35f168a3c83f4eebac3fe6cc05994682945acd7d..b24c6376ab0c30147b868fa1f8cd56e5e5b2b0bc 100644 (file)
--- a/python/samba/tests/krb5/kdc_base_test.py
+++ b/python/samba/tests/krb5/kdc_base_test.py
@@ -300,6 +300,7 @@ class KDCBaseTest(RawKerberosTest):
         else:
             creds.set_workstation(name)
         creds.set_dn(ldb.Dn(samdb, dn))
+        creds.set_upn(upn)
         creds.set_spn(spn)
         #
         # Save the account name so it can be deleted in tearDownClass
@@ -634,6 +635,7 @@ class KDCBaseTest(RawKerberosTest):
             'name_prefix': None,
             'name_suffix': None,
             'add_dollar': True,
+            'upn': None,
             'spn': None,
             'allowed_replication': False,
             'allowed_replication_mock': False,
@@ -674,6 +676,7 @@ class KDCBaseTest(RawKerberosTest):
                             name_prefix,
                             name_suffix,
                             add_dollar,
+                            upn,
                             spn,
                             allowed_replication,
                             allowed_replication_mock,
@@ -740,6 +743,7 @@ class KDCBaseTest(RawKerberosTest):
 
         creds, dn = self.create_account(samdb, user_name,
                                         account_type=account_type,
+                                        upn=upn,
                                         spn=spn,
                                         additional_details=details,
                                         account_control=user_account_control,

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 0b9fe8e7a046bbccab9159ec5b4298dba04dafd2..619a8d006b2c6387f55775edd9bed3171301a9c8 100644 (file)
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -366,6 +366,7 @@ class KerberosCredentials(Credentials):
         self.forced_salt = None
 
         self.dn = None
+        self.upn = None
         self.spn = None
 
     def set_as_supported_enctypes(self, value):
@@ -475,6 +476,12 @@ class KerberosCredentials(Credentials):
     def get_spn(self):
         return self.spn
 
+    def set_upn(self, upn):
+        self.upn = upn
+
+    def get_upn(self):
+        return self.upn
+
 
 class KerberosTicketCreds:
     def __init__(self, ticket, session_key,