The branch, master has been updated via 17ad62b samba-tool: gpo: Fix creation of filesystem ACL from directory ACL via 0c29804 s4-pysmb: Parse security info as an unsigned integer from bc9e121 s4-torture: Expand whoami test to confirm the user token.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 17ad62b33a66fea2558ff7618495e33febc9103f Author: Amitay Isaacs <ami...@gmail.com> Date: Tue Jun 19 16:49:33 2012 +1000 samba-tool: gpo: Fix creation of filesystem ACL from directory ACL Autobuild-User(master): Amitay Isaacs <ami...@samba.org> Autobuild-Date(master): Thu Jun 21 03:25:57 CEST 2012 on sn-devel-104 commit 0c29804bb03c5b612278a115bbc2cd9ea830ade7 Author: Amitay Isaacs <ami...@gmail.com> Date: Wed Jun 20 17:29:55 2012 +1000 s4-pysmb: Parse security info as an unsigned integer ----------------------------------------------------------------------- Summary of changes: source4/libcli/pysmb.c | 2 +- source4/scripting/python/samba/netcmd/gpo.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/libcli/pysmb.c b/source4/libcli/pysmb.c index 3f2efe9..14b05f7 100644 --- a/source4/libcli/pysmb.c +++ b/source4/libcli/pysmb.c @@ -365,7 +365,7 @@ static PyObject *py_smb_setacl(pytalloc_Object *self, PyObject *args, PyObject * uint32_t sinfo = 0; int fnum; - if (!PyArg_ParseTuple(args, "sO|i:get_acl", &filename, &py_sd, &sinfo)) { + if (!PyArg_ParseTuple(args, "sO|I:get_acl", &filename, &py_sd, &sinfo)) { return NULL; } diff --git a/source4/scripting/python/samba/netcmd/gpo.py b/source4/scripting/python/samba/netcmd/gpo.py index 82ea3db..88c7622 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 -- Samba Shared Repository