From: Rob van der Linde Date: Wed, 28 Feb 2024 03:59:06 +0000 (+1300) Subject: python: samdb: Make connecting_user_sid a property X-Git-Tag: tdb-1.4.11~1439 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f97df7056b800afde180a504d96bb3363394dae;p=thirdparty%2Fsamba.git python: samdb: Make connecting_user_sid a property This is following the same design as other similar properties like samdb.domain_sid, only it doesn't need a setter. Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/samdb.py b/python/samba/samdb.py index 6bd8262ad04..085dff43848 100644 --- a/python/samba/samdb.py +++ b/python/samba/samdb.py @@ -967,6 +967,9 @@ accountExpires: %u msg = self.search(base="", scope=ldb.SCOPE_BASE, attrs=["tokenGroups"])[0] return str(ndr_unpack(security.dom_sid, msg["tokenGroups"][0])) + connecting_user_sid = property(get_connecting_user_sid, + doc="SID of the connecting user") + def set_invocation_id(self, invocation_id): """Set the invocation id for this SamDB handle. diff --git a/python/samba/tests/samba_tool/user_getpassword_gmsa.py b/python/samba/tests/samba_tool/user_getpassword_gmsa.py index 967ec9e49c3..e14e2487d7a 100644 --- a/python/samba/tests/samba_tool/user_getpassword_gmsa.py +++ b/python/samba/tests/samba_tool/user_getpassword_gmsa.py @@ -69,7 +69,7 @@ class GMSAPasswordTest(BlackboxTestCase): cls.base_dn = f"CN=Managed Service Accounts,{cls.samdb.domain_dn()}" cls.user_dn = f"CN={cls.username},{cls.base_dn}" - connecting_user_sid = cls.samdb.get_connecting_user_sid() + connecting_user_sid = cls.samdb.connecting_user_sid domain_sid = security.dom_sid(cls.samdb.get_domain_sid()) allow_sddl = f"O:SYD:(A;;RP;;;{connecting_user_sid})"