diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-12-21 15:05:41 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-12-21 15:05:41 +0300 |
| commit | ddb7e770dd48a97fe80cca3ab3b26d85f3ac5139 (patch) | |
| tree | 0ac801cd53c6ecf5610009e12ce06264d0ecfcfa /winsup/doc | |
| parent | f5ad6fbb66f4abdf57b75f22017d3d70c56f27f8 (diff) | |
setfacl(1): Rewrite support for mask recomputation
* setfacl.cc (modacl): Move recomputing mask into new function.
(check_got_mask): New function checking if mask is in input.
(recompute_mask): New function to recompute mask.
(addmissing): Align mask computation to Linux setfacl.
(setfacl): Call check_got_mask and recompute_mask on Set, Delete and
Modify actions.
(usage): Rename --substitute to --set.
(longopts): Add --set option.
* utils.xml (setfacl): Rename --substitute to --set.
* new-features.xml (ov-new2.4): Rephrase setfacl changes.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/doc')
| -rw-r--r-- | winsup/doc/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/doc/new-features.xml | 6 | ||||
| -rw-r--r-- | winsup/doc/utils.xml | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog index 4bdeb5fce..0f8877b69 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,3 +1,8 @@ +2015-12-21 Corinna Vinschen <corinna@vinschen.de> + + * utils.xml (setfacl): Rename --substitute to --set. + * new-features.xml (ov-new2.4): Rephrase setfacl changes. + 2015-12-07 Johannes Schindelin <johannes.schindelin@gmx.de> * pathnames.xml: Document the new usertemp file system type. diff --git a/winsup/doc/new-features.xml b/winsup/doc/new-features.xml index 98a9e6c14..ff4b66f75 100644 --- a/winsup/doc/new-features.xml +++ b/winsup/doc/new-features.xml @@ -41,8 +41,10 @@ New API: rpmatch. </para></listitem> <listitem><para> -setfacl(1) now allows to use the -b and -k option combined to allow reducing -an ACL to only reflect standard POSIX permissions. +Align setfacl(1) usage a bit closer to the usage on Linux. Rename -d option +to -x, --substitute to --set. Add --no-mask and --mask options. Allow to +use the -b and -k option combined to allow reducing an ACL to only reflect +standard POSIX permissions. </para></listitem> <listitem><para> diff --git a/winsup/doc/utils.xml b/winsup/doc/utils.xml index d0f871efe..a00384e5f 100644 --- a/winsup/doc/utils.xml +++ b/winsup/doc/utils.xml @@ -1996,7 +1996,7 @@ setfacl [-n] {[-bk]|[-x acl_entries] [-m acl_entries]} FILE... -m, --modify modify one or more specified ACL entries\n" -n, --no-mask don't recalculate the effective rights mask\n" --mask do recalculate the effective rights mask\n" - -s, --substitute substitute specified ACL entries on FILE\n" + -s, --set set specified ACL entries on FILE\n" -V, --version print version and exit\n" -h, --help this help text\n" @@ -2100,8 +2100,8 @@ $ getfacl source_file | setfacl -f - target_file recalculate the effective rights mask, even if an ACL mask entry was explicitly given. (See the -n option.) </para> - <para> <literal>-s</literal>,<literal>--substitute</literal> Like - <literal>-f</literal>, but substitute the file's ACL with Acl_entries + <para> <literal>-s</literal>,<literal>--set</literal> Like + <literal>-f</literal>, but set the file's ACL with Acl_entries specified in a comma-separated list on the command line. </para> <para> While the <literal>-x</literal> and <literal>-m</literal> options |