summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-10-31 10:51:45 -0700
committerJeremy Allison <jra@samba.org>2008-10-31 10:51:45 -0700
commit8344e945742ff343702b9667e26082c560014523 (patch)
tree1e63530a7e4d96b47abaab0192f1f302b6aefb2e /source3/smbd
parent161cb81911fe8877bfefd8bd3553f0b3166299fb (diff)
downloadsamba-8344e945742ff343702b9667e26082c560014523.tar.gz
samba-8344e945742ff343702b9667e26082c560014523.tar.bz2
samba-8344e945742ff343702b9667e26082c560014523.zip
Unify se_access_check with the S4 code. Will make
calculation of SEC_FLAG_MAXIMUM_ALLOWED much easier for files. Jeremy.
Diffstat (limited to 'source3/smbd')
-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);
}
/****************************************************************************