diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-09-02 13:23:09 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-11-19 00:41:11 +0300 |
| commit | 4dc3deea8949d830c0a1442023bf1335841d5bcf (patch) | |
| tree | ac8df5b628ebdaa254e0cb019ab74906559a578b /winsup/doc/utils.xml | |
| parent | 911808dd5e86f054ec668b04366b6357885d6b85 (diff) | |
setfacl: Allow to combine -b and -k options
* setfacl.c (action_t): Rename DeleteAll to DeleteExt. Add
DeleteAll. Rearrange for bit-wise testing later in the code.
(delallacl): Handle -b -k combination.
(setfacl): Handle DeleteExt/DeleteAll.
(usage): Fix -b/-k output. Rearrange output to better fill 80
columns.
(main): Allow to combine -b and -k.
* utils.xml (setfacl): Accommodate -b/-k change.
* new-features.xml (ov-new2.3): Add setfacl -b/-k change.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/doc/utils.xml')
| -rw-r--r-- | winsup/doc/utils.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/winsup/doc/utils.xml b/winsup/doc/utils.xml index 7c2740dea..f48bfaec0 100644 --- a/winsup/doc/utils.xml +++ b/winsup/doc/utils.xml @@ -1969,7 +1969,7 @@ Example: regtool get '\user\software\Microsoft\Clock\iFormat' <refsynopsisdiv> <screen> setfacl [-n] {-f ACL_FILE | -s acl_entries} FILE... -setfacl [-n] {-b|-k|[-x acl_entries] [-m acl_entries]} FILE... +setfacl [-n] {[-bk]|[-x acl_entries] [-m acl_entries]} FILE... </screen> </refsynopsisdiv> @@ -2027,7 +2027,9 @@ At least one of (-b, -x, -f, -k, -m, -s) must be specified\n" <para> <literal>-b</literal>,<literal>--remove-all</literal> Remove all extended ACL entries. The base ACL entries of the owner, group and - others are retained.</para> + others are retained. This option can be combined with the + <literal>-k</literal>,<literal>--remove-default</literal> option + to delete all non-standard POSIX permissions.</para> <para> <literal>-x</literal>,<literal>--delete</literal> Delete one or more specified entries from the file's ACL. The owner, group and others @@ -2066,7 +2068,9 @@ $ getfacl source_file | setfacl -f - target_file <para> <literal>-k</literal>,<literal>--remove-default</literal> Remove all default ACL entries. If no default ACL entries exist, no warnings are - issued. </para> + issued. This option can be combined with the + <literal>-b</literal>,<literal>--remove-all</literal> option + to delete all non-standard POSIX permissions.</para> <para> <literal>-m</literal>,<literal>--modify</literal> Add or modify one or more specified ACL entries. Acl_entries is a comma-separated list of @@ -2095,7 +2099,7 @@ $ getfacl source_file | setfacl -f - target_file <para> Directories may contain default ACL entries. Files created in a directory that contains default ACL entries will have permissions according to the combination of the current umask, the explicit - permissions requested and the default ACL entries </para> + permissions requested and the default ACL entries.</para> </refsect1> </refentry> |