summaryrefslogtreecommitdiff
path: root/source3/smbd/file_access.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-11-01 00:34:39 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-11-01 00:34:39 +0100
commit72a1e3acfa5789134a28fb0609bc88b25c0e0b15 (patch)
treee7a7e8aaddbae9a97543d5b13bc16ce2e154c134 /source3/smbd/file_access.c
parent59206674521065e041a6020f9ba793fac47b1d7d (diff)
parentff274e57eacb9ac4c81adfcfea4f7b4b668a7d94 (diff)
downloadsamba-72a1e3acfa5789134a28fb0609bc88b25c0e0b15.tar.gz
samba-72a1e3acfa5789134a28fb0609bc88b25c0e0b15.tar.bz2
samba-72a1e3acfa5789134a28fb0609bc88b25c0e0b15.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/smbd/file_access.c')
-rw-r--r--source3/smbd/file_access.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index 84c993d06b..c535bc7fd8 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -30,7 +30,6 @@ bool can_access_file_acl(struct connection_struct *conn,
const char * fname,
uint32_t access_mask)
{
- bool result;
NTSTATUS status;
uint32_t access_granted;
struct security_descriptor *secdesc = NULL;
@@ -45,10 +44,10 @@ bool can_access_file_acl(struct connection_struct *conn,
return false;
}
- result = se_access_check(secdesc, conn->server_info->ptok,
- access_mask, &access_granted, &status);
+ status = se_access_check(secdesc, conn->server_info->ptok,
+ access_mask, &access_granted);
TALLOC_FREE(secdesc);
- return result;
+ return NT_STATUS_IS_OK(status);
}
/****************************************************************************