summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-08-29 13:37:51 -0700
committerJeremy Allison <jra@samba.org>2012-08-30 10:08:50 -0700
commit795920cf4a25ab4ea061d5620b19ba27884921dd (patch)
treebd3cae21966be1778b903fc98475e98ee5a3bcaa /source3/smbd
parent70ebf1da67e30b585543ffe55a6d7c9da6023138 (diff)
downloadsamba-795920cf4a25ab4ea061d5620b19ba27884921dd.tar.gz
samba-795920cf4a25ab4ea061d5620b19ba27884921dd.tar.bz2
samba-795920cf4a25ab4ea061d5620b19ba27884921dd.zip
Change the other two places where we set a security descriptor given by the client to got through set_sd(),
the canonicalize sd function.
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d078638aae..415f6adf2e 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3757,15 +3757,11 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
fsp->access_mask = FILE_GENERIC_ALL;
- /* Convert all the generic bits. */
- security_acl_map_generic(sd->dacl, &file_generic_mapping);
- security_acl_map_generic(sd->sacl, &file_generic_mapping);
-
if (sec_info_sent & (SECINFO_OWNER|
SECINFO_GROUP|
SECINFO_DACL|
SECINFO_SACL)) {
- status = SMB_VFS_FSET_NT_ACL(fsp, sec_info_sent, sd);
+ status = set_sd(fsp, sd, sec_info_sent);
}
fsp->access_mask = saved_access_mask;