summaryrefslogtreecommitdiffstats
path: root/bin/setfacl/merge.c
Commit message (Expand)AuthorAgeFilesLines
* MFC r201016:trasz2010-01-301-5/+5
* MFC r196936:trasz2010-01-301-28/+161
* /*- 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
* Add defines for access and default ACLs (ACCESS_ACL/DEFAULT_ACL)jedgar2001-12-031-6/+6
* style(9) cleanups mostly consisting of:jedgar2001-12-031-25/+21
* o Separate acl_t into internal and external representations asjedgar2001-04-241-41/+80
* o POSIX.2c Userland tool support for POSIX.1e ACLs -- getfacl retrieves ACLsrwatson2001-03-191-0/+113
OpenPOWER on IntegriCloud