summaryrefslogtreecommitdiffstats
path: root/bin/setfacl/merge.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix an error in setfacl(1) that manifested like this:trasz2012-09-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | # setfacl -m u:trasz:rwx x # setfacl -m u:root:rwx x # getfacl x # file: x # owner: root # group: wheel user::rw- user:root:rwx user:trasz:rwx group::r-- mask::rwx other::r-- # setfacl -m u:root:rwx x setfacl: x: acl_calc_mask() failed: Invalid argument setfacl: x: failed to set ACL mask For NFSv4 ACLs, this sort of situation would result in duplicated entries. MFC after: 1 month
* Switch to our preferred license text.joel2010-03-071-8/+8
| | | | Approved by: jedgar
* Improve ACL branding mismatch detection and reporting in some rare cases,trasz2009-12-261-5/+5
| | | | such as "setfacl -m ''".
* Add NFSv4 support to setfacl(1).trasz2009-09-071-28/+161
| | | | Reviewed by: rwatson
* /*- or .\"- or #- to begin license clauses.imp2005-01-101-1/+1
|
* Consistently use FBSDIDobrien2002-06-301-2/+3
|
* Remove extraneous blank linejedgar2002-02-191-1/+0
|
* Move the code merging ACL_USER and ACL_GROUP objects from underjedgar2001-12-031-22/+33
| | | | | | two nested while loops into a separate function. Obtained from: TrustedBSD Project
* Add defines for access and default ACLs (ACCESS_ACL/DEFAULT_ACL)jedgar2001-12-031-6/+6
| | | | | | to enhance readability. Obtained from: TrustedBSD Project
* style(9) cleanups mostly consisting of:jedgar2001-12-031-25/+21
| | | | | | | | | o explicitly check return values and variables against a value o return x; -> return (x); o fix inconsistent sysexits usage by nuking it (partially suggested by bde) Obtained from: TrustedBSD Project
* o Separate acl_t into internal and external representations asjedgar2001-04-241-41/+80
| | | | | | | | | | | required by POSIX.1e. This maintains the current 'struct acl' in the kernel while providing the generic external acl_t interface required to complete the ACL editing library. o Add the acl_get_entry() function. o Convert the existing ACL utilities, getfacl and setfacl, to fully make use of the ACL editing library. Obtained from: TrustedBSD Project
* o POSIX.2c Userland tool support for POSIX.1e ACLs -- getfacl retrieves ACLsrwatson2001-03-191-0/+113
from files and directories, and setfacl sets ACLs on files and directories. Submitted by: jedgar Obtained from: TrustedBSD Project
OpenPOWER on IntegriCloud