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 <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index 6bd8262ad04bbf7c625a0146ba4430cd826aa07b..085dff43848253b81238da71fa375220131a0f03 100644 (file)
--- 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 967ec9e49c3706a79dc1c5477b64e49932fb11a2..e14e2487d7ab7c6be1442d6bcb3ab8db672164dc 100644 (file)
--- 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})"