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

tests/krb5: Allow creation of disabled accounts for testing

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15655

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
(backported from commit 6dc6168719)

[jsutton@samba.org Fixed conflicting import statements in
 python/samba/tests/krb5/kdc_base_test.py]
This commit is contained in:
Jo Sutton 2024-06-25 12:51:48 +12:00 committed by Jule Anger
parent 50a417a224
commit d4c1e215a9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,7 @@ from samba.dsdb import (
GTYPE_SECURITY_DOMAIN_LOCAL_GROUP,
GTYPE_SECURITY_GLOBAL_GROUP,
GTYPE_SECURITY_UNIVERSAL_GROUP,
UF_ACCOUNTDISABLE,
UF_NORMAL_ACCOUNT,
UF_NOT_DELEGATED,
UF_NO_AUTH_DATA_REQUIRED,
@ -2007,7 +2008,8 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
'assigned_policy': None,
'assigned_silo': None,
'logon_hours': None,
'smartcard_required': False
'smartcard_required': False,
'enabled': True,
}
account_opts = {
@ -2061,7 +2063,8 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
assigned_policy,
assigned_silo,
logon_hours,
smartcard_required):
smartcard_required,
enabled):
if account_type is self.AccountType.USER:
self.assertIsNone(delegation_to_spn)
self.assertIsNone(delegation_from_dn)
@ -2086,6 +2089,8 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
user_account_control |= UF_NO_AUTH_DATA_REQUIRED
if smartcard_required:
user_account_control |= UF_SMARTCARD_REQUIRED
if not enabled:
user_account_control |= UF_ACCOUNTDISABLE
if additional_details:
details = {k: v for k, v in additional_details}