Drop the "--no-exec-mask" flag and function parameters.

[apply-default-acl.git] / doc / man / apply-default-acl.1

diff --git a/doc/man/apply-default-acl.1 b/doc/man/apply-default-acl.1
index e6a67995dc23e929b1ae2269075bb70e53453314..d3b2de1d3c83bf5f803c4edbfcb70399b044fbe2 100644 (file)
--- a/doc/man/apply-default-acl.1
+++ b/doc/man/apply-default-acl.1
@@ -5,7 +5,7 @@ apply-default-acl \- Apply default POSIX ACLs to files and directories.
 
 .SH SYNOPSIS
 
 
 .SH SYNOPSIS
 

-\fBapply-default-acl\fR [\fB-rx\fR] \fIpath\fR [\fIpath2 ...\fR]
+\fBapply-default-acl\fR [\fB-r\fR] \fIpath\fR [\fIpath2 ...\fR]

 
 .SH DESCRIPTION
 
 
 .SH DESCRIPTION
 


@@ -15,14 +15,12 @@ If the directory containing \fIpath\fR has a default ACL, the ACL on
 links are followed; symbolic links are ignored in all path components
 to avoid a dangerous race condition.
 .P
 links are followed; symbolic links are ignored in all path components
 to avoid a dangerous race condition.
 .P

-By default, a heuristic is used to determine whether or not the
-execute bit is masked on \fIpath\fR. If \fIpath\fR is not a directory,
-and no user or group has \fBeffective\fR execute permissions on
-\fIpath\fR, then the execute bit will not masked. Otherwise, it is
-left alone. In effect we pretend that the \fBx\fR permission acts like
+A heuristic is used to determine whether or not the execute bits are
+removed from \fIpath\fR. If \fIpath\fR is a directory or if some user
+or group has \fBeffective\fR execute permissions on \fIpath\fR, then
+the execute bits will be left alone. Otherwise, they will be
+removed. In effect we pretend that the \fBx\fR permission acts like

 the \fBX\fR (note the case difference) permission of \fBsetfacl\fR.
 the \fBX\fR (note the case difference) permission of \fBsetfacl\fR.

-.P
-This behavior can be modified with the \fB--no-exec-mask\fR flag.

 
 .SH OPTIONS
 .IP \fB\-\-recursive\fR,\ \fB\-r\fR
 
 .SH OPTIONS
 .IP \fB\-\-recursive\fR,\ \fB\-r\fR


@@ -30,17 +28,13 @@ Apply default ACLs recursively. This works top-down, so if directory
 \fBfoo\fR is in another directory \fBbar\fR which has a default ACL,
 then \fBbar\fR's default ACL will be applied to \fBfoo\fR before the
 contents of \fBfoo\fR are processed.
 \fBfoo\fR is in another directory \fBbar\fR which has a default ACL,
 then \fBbar\fR's default ACL will be applied to \fBfoo\fR before the
 contents of \fBfoo\fR are processed.

-.IP \fB\-\-no-exec-mask\fR,\ \fB\-x\fR
-Apply the default ACL literally; that is, don't use a heuristic to
-decide whether or not to mask the execute bit. This usually results in
-looser-than-necessary execute permissions.

 
 .SH ALGORITHM
 .IP "I. Argument validation" 0.4i
 .RS
 .IP "a. If any part of the target path contains a symlink" 0.4i
 Return failure
 
 .SH ALGORITHM
 .IP "I. Argument validation" 0.4i
 .RS
 .IP "a. If any part of the target path contains a symlink" 0.4i
 Return failure

-.IP "b. If there's no default ACL to apply"
+.IP "b. If there is no default ACL to apply"

 Return success
 .IP "c. If the target is not a (non-hardlink) regular file or directory"
 Return failure
 Return success
 .IP "c. If the target is not a (non-hardlink) regular file or directory"
 Return failure


@@ -54,10 +48,8 @@ Set the target's default ACL equal to its parent's default ACL
 Return success
 .IP "d. If the target was executable by anyone"
 Return success
 Return success
 .IP "d. If the target was executable by anyone"
 Return success

-.IP "e. If \fB--no-exec-mask\fR was given"
-Return success
-.IP "f. Unset the user/group/other/mask execute bits"
-.IP "g. Return success"
+.IP "e. Unset the user/group/other/mask execute bits"
+.IP "f. Return success"

 .RE
 .P
 The action of apply-default ACL largely mimics what the kernel would
 .RE
 .P
 The action of apply-default ACL largely mimics what the kernel would