diff options
| author | Ralph Boehme <slow@samba.org> | 2019-12-17 14:49:42 +0100 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2019-12-20 11:41:42 +0000 |
| commit | 437af4d07944f201c26cd0ebc4a5622e342d0f4c (patch) | |
| tree | 26197dfafa72f285a0007137c39b6979e1de51f2 /python/samba/provision | |
| parent | a4f3860da31a42c3905cdd8f7ff7103bf901394d (diff) | |
| download | samba-437af4d07944f201c26cd0ebc4a5622e342d0f4c.tar.gz | |
pysmbd: make "session_info" arg to py_smbd_set_nt_acl() mandatory
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'python/samba/provision')
| -rw-r--r-- | python/samba/provision/__init__.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index bb9ddd15bc7..2f7707b3659 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -1633,13 +1633,14 @@ SYSVOL_SERVICE = "sysvol" def set_dir_acl(path, acl, lp, domsid, use_ntvfs, passdb, service=SYSVOL_SERVICE): - setntacl(lp, path, acl, domsid, use_ntvfs=use_ntvfs, skip_invalid_chown=True, passdb=passdb, service=service) + session_info = system_session_unix() + setntacl(lp, path, acl, domsid, session_info, use_ntvfs=use_ntvfs, skip_invalid_chown=True, passdb=passdb, service=service) for root, dirs, files in os.walk(path, topdown=False): for name in files: - setntacl(lp, os.path.join(root, name), acl, domsid, + setntacl(lp, os.path.join(root, name), acl, domsid, session_info, use_ntvfs=use_ntvfs, skip_invalid_chown=True, passdb=passdb, service=service) for name in dirs: - setntacl(lp, os.path.join(root, name), acl, domsid, + setntacl(lp, os.path.join(root, name), acl, domsid, session_info, use_ntvfs=use_ntvfs, skip_invalid_chown=True, passdb=passdb, service=service) @@ -1657,7 +1658,9 @@ def set_gpos_acl(sysvol, dnsdomain, domainsid, domaindn, samdb, lp, use_ntvfs, p # Set ACL for GPO root folder root_policy_path = os.path.join(sysvol, dnsdomain, "Policies") - setntacl(lp, root_policy_path, POLICIES_ACL, str(domainsid), + session_info = system_session_unix() + + setntacl(lp, root_policy_path, POLICIES_ACL, str(domainsid), session_info, use_ntvfs=use_ntvfs, skip_invalid_chown=True, passdb=passdb, service=SYSVOL_SERVICE) res = samdb.search(base="CN=Policies,CN=System,%s" %(domaindn), @@ -1759,9 +1762,9 @@ def setsysvolacl(samdb, netlogon, sysvol, uid, gid, domainsid, dnsdomain, def _setntacl(path): """A helper to reuse args""" return setntacl( - lp, path, SYSVOL_ACL, str(domainsid), + lp, path, SYSVOL_ACL, str(domainsid), session_info, use_ntvfs=use_ntvfs, skip_invalid_chown=True, passdb=s4_passdb, - service=SYSVOL_SERVICE, session_info=session_info) + service=SYSVOL_SERVICE) # Set the SYSVOL_ACL on the sysvol folder and subfolder (first level) _setntacl(sysvol) |