From 6dc6168719cf232ac2c1d747f10aad9b13300c02 Mon Sep 17 00:00:00 2001 From: Jo Sutton Date: Tue, 25 Jun 2024 12:51:48 +1200 Subject: [PATCH] tests/krb5: Allow creation of disabled accounts for testing BUG: https://bugzilla.samba.org/show_bug.cgi?id=15655 Signed-off-by: Jo Sutton Reviewed-by: Douglas Bagnall --- python/samba/tests/krb5/kdc_base_test.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py index eb3497c554e..df5e22be4ae 100644 --- a/python/samba/tests/krb5/kdc_base_test.py +++ b/python/samba/tests/krb5/kdc_base_test.py @@ -79,6 +79,7 @@ from samba.dsdb import ( GTYPE_SECURITY_DOMAIN_LOCAL_GROUP, GTYPE_SECURITY_GLOBAL_GROUP, GTYPE_SECURITY_UNIVERSAL_GROUP, + UF_ACCOUNTDISABLE, UF_NO_AUTH_DATA_REQUIRED, UF_NORMAL_ACCOUNT, UF_NOT_DELEGATED, @@ -2016,7 +2017,8 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest): 'assigned_policy': None, 'assigned_silo': None, 'logon_hours': None, - 'smartcard_required': False + 'smartcard_required': False, + 'enabled': True, } account_opts = { @@ -2074,7 +2076,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) @@ -2100,6 +2103,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} -- 2.47.2