From: Stefan Metzmacher Date: Thu, 3 Dec 2020 12:59:58 +0000 (+0100) Subject: python/ntacls.py: let SMBHelper.get_acl() use the default values of self.smb_conn... X-Git-Tag: samba-4.14.0rc1~237 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b082cf321e4267cc214f2a74550847585275e25a;p=thirdparty%2Fsamba.git python/ntacls.py: let SMBHelper.get_acl() use the default values of self.smb_conn.get_acl() Now that self.smb_conn.get_acl() has sane default values for secinfo and access_mask we can remove any additional logic in SMBHelper. The resulting values are the same. Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py index 0dcf958f727..b8a7d9b442b 100644 --- a/python/samba/ntacls.py +++ b/python/samba/ntacls.py @@ -49,12 +49,6 @@ SECURITY_SECINFO_FLAGS = security.SECINFO_OWNER | \ security.SECINFO_DACL | \ security.SECINFO_SACL - -# SEC_FLAG_SYSTEM_SECURITY is required otherwise get Access Denied -SECURITY_SEC_FLAGS = security.SEC_FLAG_SYSTEM_SECURITY | \ - security.SEC_STD_READ_CONTROL - - class XattrBackendError(Exception): """A generic xattr backend error.""" @@ -335,11 +329,13 @@ class SMBHelper: self.smb_conn = smb_conn self.dom_sid = dom_sid - def get_acl(self, smb_path, as_sddl=False): + def get_acl(self, smb_path, as_sddl=False, + sinfo=None, access_mask=None): assert '/' not in smb_path - ntacl_sd = self.smb_conn.get_acl( - smb_path, SECURITY_SECINFO_FLAGS, SECURITY_SEC_FLAGS) + ntacl_sd = self.smb_conn.get_acl(smb_path, + sinfo=sinfo, + access_mask=access_mask) return ntacl_sd.as_sddl(self.dom_sid) if as_sddl else ntacl_sd