PERFORCE change 144607 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Fri Jul 4 09:46:45 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144607
Change 144607 by trasz at trasz_traszkan on 2008/07/04 09:45:48
Fix obvious bug in ACL recalculation.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#3 edit
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#3 (text+ko) ====
@@ -429,29 +429,29 @@
if (entry->ae_tag == ACL_USER && entry->ae_id == file_owner_id)
amode = amode >> 3;
- if (entry->ae_perm | ACL_READ_DATA) {
- if (amode | ACL_READ)
+ if (entry->ae_perm & ACL_READ_DATA) {
+ if (amode & ACL_READ)
previous->ae_perm &= ~ACL_READ_DATA;
else
previous->ae_perm |= ACL_READ_DATA;
}
- if (entry->ae_perm | ACL_WRITE_DATA) {
- if (amode | ACL_WRITE)
+ if (entry->ae_perm & ACL_WRITE_DATA) {
+ if (amode & ACL_WRITE)
previous->ae_perm &= ~ACL_WRITE_DATA;
else
previous->ae_perm |= ACL_WRITE_DATA;
}
- if (entry->ae_perm | ACL_APPEND_DATA) {
- if (amode | ACL_WRITE)
+ if (entry->ae_perm & ACL_APPEND_DATA) {
+ if (amode & ACL_WRITE)
previous->ae_perm &= ~ACL_APPEND_DATA;
else
previous->ae_perm |= ACL_APPEND_DATA;
}
- if (entry->ae_perm | ACL_EXECUTE) {
- if (amode | ACL_EXECUTE)
+ if (entry->ae_perm & ACL_EXECUTE) {
+ if (amode & ACL_EXECUTE)
previous->ae_perm &= ~ACL_EXECUTE;
else
previous->ae_perm |= ACL_EXECUTE;
More information about the p4-projects
mailing list