History log of /freebsd-10-stable/bin/setfacl/merge.c
Revision Date Author Comments
(<<< Hide modified files)
(Show modified files >>>)
# 256281 10-Oct-2013 gjb

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

# 240087 04-Sep-2012 trasz

Fix an error in setfacl(1) that manifested like this:

# 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


# 204819 07-Mar-2010 joel

Switch to our preferred license text.

Approved by: jedgar


# 201016 26-Dec-2009 trasz

Improve ACL branding mismatch detection and reporting in some rare cases,
such as "setfacl -m ''".


# 196936 07-Sep-2009 trasz

Add NFSv4 support to setfacl(1).

Reviewed by: rwatson


# 139969 10-Jan-2005 imp

/*- or .\"- or #- to begin license clauses.


# 99110 30-Jun-2002 obrien

Consistently use FBSDID


# 90888 19-Feb-2002 jedgar

Remove extraneous blank line


# 87260 03-Dec-2001 jedgar

Move the code merging ACL_USER and ACL_GROUP objects from under
two nested while loops into a separate function.

Obtained from: TrustedBSD Project


# 87259 02-Dec-2001 jedgar

Add defines for access and default ACLs (ACCESS_ACL/DEFAULT_ACL)
to enhance readability.

Obtained from: TrustedBSD Project


# 87254 02-Dec-2001 jedgar

style(9) cleanups mostly consisting of:
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


# 75928 24-Apr-2001 jedgar

o Separate acl_t into internal and external representations as
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


# 74465 19-Mar-2001 rwatson

o POSIX.2c Userland tool support for POSIX.1e ACLs -- getfacl retrieves ACLs
from files and directories, and setfacl sets ACLs on files and directories.

Submitted by: jedgar
Obtained from: TrustedBSD Project