sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

tests/krb5: Allow specifying SamDB to use when creating an account

Browse Source 
Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Jo Sutton 2024-03-08 16:34:49 +13:00 committed by Andrew Bartlett
parent 0bc8d1469b
commit 67457394e4
1 changed files with 9 additions and 3 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

@ -1968,6 +1968,7 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
def get_cached_creds(self, *,
account_type: AccountType,
opts: Optional[dict]=None,
samdb: Optional[SamDB]=None,
use_cache=True) -> KerberosCredentials:
if opts is None:
opts = {}
@ -2013,18 +2014,22 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
}
if use_cache:
self.assertIsNone(samdb)
cache_key = tuple(sorted(account_opts.items()))
creds = self.account_cache.get(cache_key)
if creds is not None:
return creds
creds = self.create_account_opts(use_cache, **account_opts)
creds = self.create_account_opts(samdb, use_cache, **account_opts)
if use_cache:
self.account_cache[cache_key] = creds
return creds
def create_account_opts(self, use_cache, *,
def create_account_opts(self,
samdb: Optional[SamDB],
use_cache,
*,
account_type,
name_prefix,
name_suffix,
@ -2064,7 +2069,8 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
else:
self.assertFalse(not_delegated)
samdb = self.get_samdb()
if samdb is None:
samdb = self.get_samdb()
user_name = self.get_new_username()
if name_prefix is not None: