diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 00:34:39 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 00:34:39 +0100 |
commit | 72a1e3acfa5789134a28fb0609bc88b25c0e0b15 (patch) | |
tree | e7a7e8aaddbae9a97543d5b13bc16ce2e154c134 /source3/modules/vfs_acl_xattr.c | |
parent | 59206674521065e041a6020f9ba793fac47b1d7d (diff) | |
parent | ff274e57eacb9ac4c81adfcfea4f7b4b668a7d94 (diff) | |
download | samba-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/modules/vfs_acl_xattr.c')
-rw-r--r-- | source3/modules/vfs_acl_xattr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c index 6932d522d4..ca34e97155 100644 --- a/source3/modules/vfs_acl_xattr.c +++ b/source3/modules/vfs_acl_xattr.c @@ -376,11 +376,11 @@ static int open_acl_xattr(vfs_handle_struct *handle, &pdesc); if (NT_STATUS_IS_OK(status)) { /* See if we can access it. */ - if (!se_access_check(pdesc, + status = se_access_check(pdesc, handle->conn->server_info->ptok, fsp->access_mask, - &access_granted, - &status)) { + &access_granted); + if (!NT_STATUS_IS_OK(status)) { errno = map_errno_from_nt_status(status); return -1; } |