diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-01 11:36:33 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-01 11:36:33 +0000 |
| commit | 363d63cac68cdd10faf2dc4f7b4685713a4706af (patch) | |
| tree | 2623fbf36694640e6015b4570f47f217b4df8ccd /usr/src/common/acl/acl_common.c | |
| parent | 54a7e5761a35624975c2f384a98b3235bf625094 (diff) | |
| parent | ef9416a894c90df5d46b888dbe2908c7f00fd409 (diff) | |
| download | illumos-joyent-363d63cac68cdd10faf2dc4f7b4685713a4706af.tar.gz | |
[illumos-gate merge]
commit ef9416a894c90df5d46b888dbe2908c7f00fd409
12296 unix: access_mask_check() warn: bitwise AND condition is false here
commit 9f9cceb6f1158940244c35cecdbc93f9a386a4b8
12662 smbios(1M) interprets jedec IDs incorrectly
12664 fix smbios memory technology operating mode capabilities
commit f343451914d0efaf2d6fc84d8818a16246b223dc
12635 Allow for '-o feature@<feature>=disabled' on the command line
Diffstat (limited to 'usr/src/common/acl/acl_common.c')
| -rw-r--r-- | usr/src/common/acl/acl_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/common/acl/acl_common.c b/usr/src/common/acl/acl_common.c index 765d6cef12..3b4f9bdec8 100644 --- a/usr/src/common/acl/acl_common.c +++ b/usr/src/common/acl/acl_common.c @@ -875,8 +875,8 @@ access_mask_check(ace_t *acep, int mask_bit, int isowner) set_allow = ACL_WRITE_ATTRS_WRITER_SET_ALLOW; err_allow = ACL_WRITE_ATTRS_WRITER_ERR_ALLOW; } else { - if ((acep->a_access_mask & mask_bit) && - (acep->a_type & ACE_ACCESS_ALLOWED_ACE_TYPE)) { + if (((acep->a_access_mask & mask_bit) != 0) && + (acep->a_type == ACE_ACCESS_ALLOWED_ACE_TYPE)) { return (ENOTSUP); } return (0); |