summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2008-11-04 18:08:03 -0800
committerTim Prouty <tprouty@samba.org>2008-12-09 14:51:48 -0800
commit6153f622af0cd7855ca349f73307988c1b9478b8 (patch)
tree061ec1daaceba2cfe933ef42c9e9e6a908ba17e6 /source3/smbd
parentd5d9d3dc0e2c85ab608972cfa8e41122504fb75e (diff)
downloadsamba-6153f622af0cd7855ca349f73307988c1b9478b8.tar.gz
samba-6153f622af0cd7855ca349f73307988c1b9478b8.tar.bz2
samba-6153f622af0cd7855ca349f73307988c1b9478b8.zip
s3: Refactor getting sec_info from a security_descriptor into separate function
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 5bd28862e1..d59f018cfb 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2963,21 +2963,10 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
if ((sd != NULL) && (info == FILE_WAS_CREATED)
&& lp_nt_acl_support(SNUM(conn))) {
- uint32_t sec_info_sent = ALL_SECURITY_INFORMATION;
+ uint32_t sec_info_sent;
uint32_t saved_access_mask = fsp->access_mask;
- if (sd->owner_sid == NULL) {
- sec_info_sent &= ~OWNER_SECURITY_INFORMATION;
- }
- if (sd->group_sid == NULL) {
- sec_info_sent &= ~GROUP_SECURITY_INFORMATION;
- }
- if (sd->sacl == NULL) {
- sec_info_sent &= ~SACL_SECURITY_INFORMATION;
- }
- if (sd->dacl == NULL) {
- sec_info_sent &= ~DACL_SECURITY_INFORMATION;
- }
+ sec_info_sent = get_sec_info(sd);
fsp->access_mask = FILE_GENERIC_ALL;