sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

tests/krb5: Allow creating machine accounts without a trailing dollar

Browse Source 
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>
This commit is contained in:
Joseph Sutton 2021-10-20 12:44:19 +13:00 committed by Stefan Metzmacher
parent 7e39994ed3
commit f4785ccfef
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/samba/tests/krb5/kdc_base_test.py
View File

@ -237,7 +237,7 @@ class KDCBaseTest(RawKerberosTest):
def create_account(self, samdb, name, account_type=AccountType.USER, def create_account(self, samdb, name, account_type=AccountType.USER,
spn=None, upn=None, additional_details=None, spn=None, upn=None, additional_details=None,
ou=None, account_control=0): ou=None, account_control=0, add_dollar=True):
'''Create an account for testing. '''Create an account for testing.
The dn of the created account is added to self.accounts, The dn of the created account is added to self.accounts,
which is used by tearDownClass to clean up the created accounts. which is used by tearDownClass to clean up the created accounts.
@ -255,13 +255,14 @@ class KDCBaseTest(RawKerberosTest):
# remove the account if it exists, this will happen if a previous test # remove the account if it exists, this will happen if a previous test
# run failed # run failed
delete_force(samdb, dn) delete_force(samdb, dn)
account_name = name
if account_type is self.AccountType.USER: if account_type is self.AccountType.USER:
object_class = "user" object_class = "user"
account_name = name
account_control |= UF_NORMAL_ACCOUNT account_control |= UF_NORMAL_ACCOUNT
else: else:
object_class = "computer" object_class = "computer"
account_name = "%s$" % name if add_dollar:
account_name += '$'
if account_type is self.AccountType.COMPUTER: if account_type is self.AccountType.COMPUTER:
account_control |= UF_WORKSTATION_TRUST_ACCOUNT account_control |= UF_WORKSTATION_TRUST_ACCOUNT
else: else:
@ -632,6 +633,7 @@ class KDCBaseTest(RawKerberosTest):
opts_default = { opts_default = {
'name_prefix': None, 'name_prefix': None,
'name_suffix': None, 'name_suffix': None,
'add_dollar': True,
'spn': None, 'spn': None,
'allowed_replication': False, 'allowed_replication': False,
'allowed_replication_mock': False, 'allowed_replication_mock': False,
@ -671,6 +673,7 @@ class KDCBaseTest(RawKerberosTest):
account_type, account_type,
name_prefix, name_prefix,
name_suffix, name_suffix,
add_dollar,
spn, spn,
allowed_replication, allowed_replication,
allowed_replication_mock, allowed_replication_mock,
@ -739,7 +742,8 @@ class KDCBaseTest(RawKerberosTest):
account_type=account_type, account_type=account_type,
spn=spn, spn=spn,
additional_details=details, additional_details=details,
account_control=user_account_control) account_control=user_account_control,
add_dollar=add_dollar)
keys = self.get_keys(samdb, dn) keys = self.get_keys(samdb, dn)
self.creds_set_keys(creds, keys) self.creds_set_keys(creds, keys)