diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-11-05 20:44:14 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-11-06 00:12:43 +0100 |
| commit | ab30a8bf0fb9bd4ee3c907183132f3b9abb67c7a (patch) | |
| tree | a207980788d14864f62b9f4805495912f857af19 /source4/scripting/python/samba/provision | |
| parent | 033451587db21d6e4b829e89a64f894a32682131 (diff) | |
| download | samba-ab30a8bf0fb9bd4ee3c907183132f3b9abb67c7a.tar.gz samba-ab30a8bf0fb9bd4ee3c907183132f3b9abb67c7a.tar.xz samba-ab30a8bf0fb9bd4ee3c907183132f3b9abb67c7a.zip | |
provision: Make dsacl2fsacl() take a security.dom_sid, not str
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Nov 6 00:12:43 CET 2012 on sn-devel-104
Diffstat (limited to 'source4/scripting/python/samba/provision')
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index ba50ff30e6..47bc6f92d8 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -1395,7 +1395,7 @@ def set_gpos_acl(sysvol, dnsdomain, domainsid, domaindn, samdb, lp, use_ntvfs, p acl = ndr_unpack(security.descriptor, str(policy["nTSecurityDescriptor"])).as_sddl() policy_path = getpolicypath(sysvol, dnsdomain, str(policy["cn"])) - set_dir_acl(policy_path, dsacl2fsacl(acl, str(domainsid)), lp, + set_dir_acl(policy_path, dsacl2fsacl(acl, domainsid), lp, str(domainsid), use_ntvfs, passdb=passdb) @@ -1522,7 +1522,7 @@ def check_gpos_acl(sysvol, dnsdomain, domainsid, domaindn, samdb, lp, acl = ndr_unpack(security.descriptor, str(policy["nTSecurityDescriptor"])).as_sddl() policy_path = getpolicypath(sysvol, dnsdomain, str(policy["cn"])) - check_dir_acl(policy_path, dsacl2fsacl(acl, str(domainsid)), lp, + check_dir_acl(policy_path, dsacl2fsacl(acl, domainsid), lp, domainsid, direct_db_access) |