generating formats for new 'restrict acl...' parameter

3 files changed, 227 insertions, 19 deletions

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 4614004011a..26f1b83a1ed 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -1618,8 +1618,9 @@
 
 		<para>Note that by default this parameter does not apply to permissions
 		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
-		this mask on access control lists also, they need to set the <link linkend="RESTRICTACLWITHMASK"><parameter>
-		restrict acl with mask</parameter></link> to true.</para>
+		this mask on access control lists also, they need to set the <link 
+		linkend="RESTRICTACLWITHMASK"><parameter>restrict acl with 
+		mask</parameter></link> to true.</para>
 
 		<para>Default: <command>create mask = 0744</command></para>
 		<para>Example: <command>create mask = 0775</command></para></listitem>
@@ -2088,8 +2089,9 @@
 
 		<para>Note that by default this parameter does not apply to permissions
 		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
-		this mask on access control lists also, they need to set the <link linkend="RESTRICTACLWITHMASK"><parameter>
-		restrict acl with mask</parameter></link> to true.</para>
+		this mask on access control lists also, they need to set the <link 
+		linkend="RESTRICTACLWITHMASK"><parameter>restrict acl with 
+		mask</parameter></link> to true.</para>
 
 		<para>See the <link linkend="FORCEDIRECTORYMODE"><parameter>force 
 		directory mode</parameter></link> parameter to cause particular mode 
@@ -2562,8 +2564,9 @@
 		
 		<para>Note that by default this parameter does not apply to permissions
 		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
-		this mask on access control lists also, they need to set the <link linkend="RESTRICTACLWITHMASK"><parameter>
-		restrict acl with mask</parameter></link> to true.</para>
+		this mask on access control lists also, they need to set the <link 
+		linkend="RESTRICTACLWITHMASK"><parameter>restrict acl with 
+		mask</parameter></link> to true.</para>
 
 		<para>See also the parameter <link linkend="CREATEMASK"><parameter>create 
 		mask</parameter></link> for details on masking mode bits on files.</para>
@@ -2595,8 +2598,9 @@
 
 		<para>Note that by default this parameter does not apply to permissions
 		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
-		this mask on access control lists also, they need to set the <link linkend="RESTRICTACLWITHMASK"><parameter>
-		restrict acl with mask</parameter></link> to true.</para>
+		this mask on access control lists also, they need to set the <link 
+		linkend="RESTRICTACLWITHMASK"><parameter>restrict acl with 
+		mask</parameter></link> to true.</para>
 
 		<para>See also the parameter <link linkend="DIRECTORYMASK"><parameter>
 		directory mask</parameter></link> for details on masking mode bits 
@@ -5967,9 +5971,9 @@
 		parameters <link linkend="CREATEMASK"><parameter>create mask</parameter></link>,
 		<link linkend="FORCECREATEMODE"><parameter>force create mode</parameter></link>
 		applied before setting the ACL, and all requests to set an ACL on a directory will
-		have the parameters <link linkend="DIRECTORYMASK"><parameter>
-        directory mask</parameter></link>, <link linkend="FORCEDIRECTORYMODE"><parameter>
-        force directory mode</parameter></link> applied before setting the ACL.
+		have the parameters <link linkend="DIRECTORYMASK"><parameter>directory 
+		mask</parameter></link>, <link linkend="FORCEDIRECTORYMODE"><parameter>force 
+		directory mode</parameter></link> applied before setting the ACL.
 		</para>
 
 		<para>See also <link linkend="CREATEMASK"><parameter>create mask</parameter></link>,
@@ -5978,13 +5982,13 @@
 		<link linkend="FORCEDIRECTORYMODE"><parameter>force directory mode</parameter></link>
 		</para>
 
-		<para>Default: <command>restrict acl with mask = False</command></para>
+		<para>Default: <command>restrict acl with mask = no</command></para>
+		</listitem>
 		</varlistentry>
 
 
 
 
-		</listitem>
 		<varlistentry>
 		<term><anchor id="RESTRICTANONYMOUS">restrict anonymous (G)</term>
 		<listitem><para>This is a boolean parameter.  If it is true, then 
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 14be9fb30dc..612b2736a84 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -3910,6 +3910,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#RESTRICTACLWITHMASK"
+><TT
+CLASS="PARAMETER"
+><I
+>restrict acl with mask</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#ROOTPOSTEXEC"
 ><TT
 CLASS="PARAMETER"
@@ -4236,7 +4248,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1381"
+NAME="AEN1385"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -5931,6 +5943,19 @@ CLASS="PARAMETER"
 ></A
 > parameter.</P
 ><P
+>Note that by default this parameter does not apply to permissions
+		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+		this mask on access control lists also, they need to set the <A
+HREF="#RESTRICTACLWITHMASK"
+><TT
+CLASS="PARAMETER"
+><I
+>restrict acl with 
+		mask</I
+></TT
+></A
+> to true.</P
+><P
 >Default: <B
 CLASS="COMMAND"
 >create mask = 0744</B
@@ -6859,6 +6884,19 @@ CLASS="PARAMETER"
 > parameter. This parameter is set to 000 by 
 		default (i.e. no extra mode bits are added).</P
 ><P
+>Note that by default this parameter does not apply to permissions
+		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+		this mask on access control lists also, they need to set the <A
+HREF="#RESTRICTACLWITHMASK"
+><TT
+CLASS="PARAMETER"
+><I
+>restrict acl with 
+		mask</I
+></TT
+></A
+> to true.</P
+><P
 >See the <A
 HREF="#FORCEDIRECTORYMODE"
 ><TT
@@ -7744,6 +7782,19 @@ CLASS="PARAMETER"
 > 
 		parameter is applied.</P
 ><P
+>Note that by default this parameter does not apply to permissions
+		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+		this mask on access control lists also, they need to set the <A
+HREF="#RESTRICTACLWITHMASK"
+><TT
+CLASS="PARAMETER"
+><I
+>restrict acl with 
+		mask</I
+></TT
+></A
+> to true.</P
+><P
 >See also the parameter <A
 HREF="#CREATEMASK"
 ><TT
@@ -7803,6 +7854,19 @@ CLASS="PARAMETER"
 > is 
 		applied.</P
 ><P
+>Note that by default this parameter does not apply to permissions
+		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+		this mask on access control lists also, they need to set the <A
+HREF="#RESTRICTACLWITHMASK"
+><TT
+CLASS="PARAMETER"
+><I
+>restrict acl with 
+		mask</I
+></TT
+></A
+> to true.</P
+><P
 >See also the parameter <A
 HREF="#DIRECTORYMASK"
 ><TT
@@ -14331,6 +14395,102 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="RESTRICTACLWITHMASK"
+></A
+>restrict acl with mask (S)</DT
+><DD
+><P
+>This is a boolean parameter.  If set to false (default), then 
+		Creation of files with access control lists (ACLS) and modification of ACLs
+		using the Windows NT/2000 ACL editor will be applied directly to the file
+		or directory.</P
+><P
+>If set to True, then all requests to set an ACL on a file will have the
+		parameters <A
+HREF="#CREATEMASK"
+><TT
+CLASS="PARAMETER"
+><I
+>create mask</I
+></TT
+></A
+>,
+		<A
+HREF="#FORCECREATEMODE"
+><TT
+CLASS="PARAMETER"
+><I
+>force create mode</I
+></TT
+></A
+>
+		applied before setting the ACL, and all requests to set an ACL on a directory will
+		have the parameters <A
+HREF="#DIRECTORYMASK"
+><TT
+CLASS="PARAMETER"
+><I
+>directory 
+		mask</I
+></TT
+></A
+>, <A
+HREF="#FORCEDIRECTORYMODE"
+><TT
+CLASS="PARAMETER"
+><I
+>force 
+		directory mode</I
+></TT
+></A
+> applied before setting the ACL.
+		</P
+><P
+>See also <A
+HREF="#CREATEMASK"
+><TT
+CLASS="PARAMETER"
+><I
+>create mask</I
+></TT
+></A
+>,
+		<A
+HREF="#FORCECREATEMODE"
+><TT
+CLASS="PARAMETER"
+><I
+>force create mode</I
+></TT
+></A
+>,
+		<A
+HREF="#DIRECTORYMASK"
+><TT
+CLASS="PARAMETER"
+><I
+>directory mask</I
+></TT
+></A
+>,
+		<A
+HREF="#FORCEDIRECTORYMODE"
+><TT
+CLASS="PARAMETER"
+><I
+>force directory mode</I
+></TT
+></A
+>
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>restrict acl with mask = no</B
+></P
+></DD
+><DT
+><A
 NAME="RESTRICTANONYMOUS"
 ></A
 >restrict anonymous (G)</DT
@@ -18122,7 +18282,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5744"
+NAME="AEN5785"
 ></A
 ><H2
 >WARNINGS</H2
@@ -18152,7 +18312,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5750"
+NAME="AEN5791"
 ></A
 ><H2
 >VERSION</H2
@@ -18163,7 +18323,7 @@ NAME="AEN5750"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5753"
+NAME="AEN5794"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -18242,7 +18402,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5773"
+NAME="AEN5814"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 26d2eaec1de..8228d14f24b 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "03 May 2001" "" ""
+.TH "SMB.CONF" "5" "04 May 2001" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -1266,6 +1266,9 @@ each parameter for details. Note that some are synonyms.
 \fIread only\fR
 .TP 0.2i
 \(bu
+\fIrestrict acl with mask\fR
+.TP 0.2i
+\(bu
 \fIroot postexec\fR
 .TP 0.2i
 \(bu
@@ -1967,6 +1970,11 @@ create mode\fR parameter for forcing particular mode
 bits to be set on created files. See also the  \fIdirectory mode"\fR parameter for masking 
 mode bits on created directories. See also the  \fIinherit permissions\fR parameter.
 
+Note that by default this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+this mask on access control lists also, they need to set the \fIrestrict acl with 
+mask\fR to true.
+
 Default: \fBcreate mask = 0744\fR
 
 Example: \fBcreate mask = 0775\fR
@@ -2327,6 +2335,11 @@ created from this parameter with the value of the \fIforce directory mode
 \fRparameter. This parameter is set to 000 by 
 default (i.e. no extra mode bits are added).
 
+Note that by default this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+this mask on access control lists also, they need to set the \fIrestrict acl with 
+mask\fR to true.
+
 See the \fIforce 
 directory mode\fR parameter to cause particular mode 
 bits to always be set on created directories.
@@ -2684,6 +2697,11 @@ permissions changed. The default for this parameter is (in octal)
 mode after the mask set in the \fIcreate mask\fR 
 parameter is applied.
 
+Note that by default this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+this mask on access control lists also, they need to set the \fIrestrict acl with 
+mask\fR to true.
+
 See also the parameter \fIcreate 
 mask\fR for details on masking mode bits on files.
 
@@ -2708,6 +2726,11 @@ bits to a created directory. This operation is done after the mode
 mask in the parameter \fIdirectory mask\fR is 
 applied.
 
+Note that by default this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+this mask on access control lists also, they need to set the \fIrestrict acl with 
+mask\fR to true.
+
 See also the parameter \fI directory mask\fR for details on masking mode bits 
 on created directories.
 
@@ -5355,6 +5378,27 @@ is in fact the browse master on it's segment.
 
 Default: \fBremote browse sync = <empty string>
 \fR.TP
+\fBrestrict acl with mask (S)\fR
+This is a boolean parameter. If set to false (default), then 
+Creation of files with access control lists (ACLS) and modification of ACLs
+using the Windows NT/2000 ACL editor will be applied directly to the file
+or directory.
+
+If set to True, then all requests to set an ACL on a file will have the
+parameters \fIcreate mask\fR,
+\fIforce create mode\fR
+applied before setting the ACL, and all requests to set an ACL on a directory will
+have the parameters \fIdirectory 
+mask\fR, \fIforce 
+directory mode\fR applied before setting the ACL.
+
+See also \fIcreate mask\fR,
+\fIforce create mode\fR,
+\fIdirectory mask\fR,
+\fIforce directory mode\fR
+
+Default: \fBrestrict acl with mask = no\fR
+.TP
 \fBrestrict anonymous (G)\fR
 This is a boolean parameter. If it is true, then 
 anonymous access to the server will be restricted, namely in the