summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2012-06-19 16:49:33 +1000
committerAmitay Isaacs <amitay@samba.org>2012-06-21 03:25:57 +0200
commit17ad62b33a66fea2558ff7618495e33febc9103f (patch)
treeeb41f94c950d471c3b2001e67cd5ae1859eeb920 /source4
parent0c29804bb03c5b612278a115bbc2cd9ea830ade7 (diff)
downloadsamba-17ad62b33a66fea2558ff7618495e33febc9103f.tar.gz
samba-17ad62b33a66fea2558ff7618495e33febc9103f.tar.bz2
samba-17ad62b33a66fea2558ff7618495e33febc9103f.zip
samba-tool: gpo: Fix creation of filesystem ACL from directory ACL
Autobuild-User(master): Amitay Isaacs <amitay@samba.org> Autobuild-Date(master): Thu Jun 21 03:25:57 CEST 2012 on sn-devel-104
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/netcmd/gpo.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/netcmd/gpo.py b/source4/scripting/python/samba/netcmd/gpo.py
index 82ea3db8b9..88c76227b2 100644
--- a/source4/scripting/python/samba/netcmd/gpo.py
+++ b/source4/scripting/python/samba/netcmd/gpo.py
@@ -910,10 +910,16 @@ class cmd_create(Command):
ds_sd = ndr_unpack(security.descriptor, ds_sd_ndr).as_sddl()
# Create a file system security descriptor
- fs_sd = security.descriptor(dsacl2fsacl(ds_sd, self.samdb.get_domain_sid()))
+ domain_sid = self.samdb.get_domain_sid()
+ sddl = dsacl2fsacl(ds_sd, domain_sid)
+ fs_sd = security.descriptor.from_sddl(sddl, security.dom_sid(domain_sid))
# Set ACL
- conn.set_acl(sharepath, fs_sd)
+ sio = ( security.SECINFO_OWNER |
+ security.SECINFO_GROUP |
+ security.SECINFO_DACL |
+ security.SECINFO_PROTECTED_DACL )
+ conn.set_acl(sharepath, fs_sd, sio)
except:
self.samdb.transaction_cancel()
raise