Documentation fixes for bug #9462 - Users can not be given write permissions any...

Ensure we don't apply the masks + force modes on security setting
changes, only on create.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/docs-xml/smbdotconf/security/createmask.xml b/docs-xml/smbdotconf/security/createmask.xml
index 59e208dccd6446646b967a3ece667d5dee1b291f..5df07188d6429d60a3295411327d27aac5fa5a3d 100644 (file)
--- a/docs-xml/smbdotconf/security/createmask.xml
+++ b/docs-xml/smbdotconf/security/createmask.xml
@@ -26,11 +26,6 @@
        This parameter does not affect directory masks. See the parameter <smbconfoption name="directory mask"/>
        for details.
        </para>
-
-    <para>
-       New in Samba 4.0.0. This mask is applied whenever permissions are changed on a file. To allow clients full control
-       over permission changes it should be set to 0777.
-       </para>
 </description>
 
 <related>force create mode</related>

diff --git a/docs-xml/smbdotconf/security/directorymask.xml b/docs-xml/smbdotconf/security/directorymask.xml
index 2ebfc16d14f1b01d7f3cab630d7fc8b8eafb44cb..b17625c95b7c1d1021b9f4d76c9247fed98b237a 100644 (file)
--- a/docs-xml/smbdotconf/security/directorymask.xml
+++ b/docs-xml/smbdotconf/security/directorymask.xml
@@ -23,11 +23,6 @@
     <para>Following this Samba will bit-wise 'OR' the UNIX mode 
     created from this parameter with the value of the <smbconfoption name="force directory mode"/> parameter. 
     This parameter is set to 000 by default (i.e. no extra mode bits are added).</para>
-
-    <para>
-    New in Samba 4.0.0. This mask is applied whenever permissions are changed on a directory. To allow clients full control
-    over permission changes it should be set to 0777.
-    </para>
 </description>
 
 <related>force directory mode</related>

diff --git a/docs-xml/smbdotconf/security/directorysecuritymask.xml b/docs-xml/smbdotconf/security/directorysecuritymask.xml
index c5c8c65b2ced8a88cd9b56502ba3634e3cde21ee..ad208f4e2a9f5f219ee2cff9c98862689e885d26 100644 (file)
--- a/docs-xml/smbdotconf/security/directorysecuritymask.xml
+++ b/docs-xml/smbdotconf/security/directorysecuritymask.xml
@@ -5,9 +5,7 @@
                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
-       This parameter has been removed for Samba 4.0.0. The parameter
-       <smbconfoption name="directory mask"/> is now used instead to mask
-       any permission bit changes on directories.
+       This parameter has been removed for Samba 4.0.0.
     </para>
 </description>
 

diff --git a/docs-xml/smbdotconf/security/forcecreatemode.xml b/docs-xml/smbdotconf/security/forcecreatemode.xml
index 5a57a294afc08f7f5b730fb6dd12ac73e6dc330d..a3f1c2c1055fb220ca4c60aff18cbe9367f87402 100644 (file)
--- a/docs-xml/smbdotconf/security/forcecreatemode.xml
+++ b/docs-xml/smbdotconf/security/forcecreatemode.xml
@@ -10,12 +10,6 @@
     mode after the mask set in the <parameter moreinfo="none">create mask</parameter>
     parameter is applied.</para>
 
-    <para>
-    New in Samba 4.0.0. This mode is also 'OR'ed into the mode bits whenever
-    permissions are changed on a file, not just when the file is created.
-    This replaces the now removed <parameter moreinfo="none">force security mode</parameter>.
-    </para>
-
     <para>The example below would force all newly created files to have read and execute
     permissions set for 'group' and 'other' as well as the
     read/write/execute bits set for the 'user'.</para>

diff --git a/docs-xml/smbdotconf/security/forcedirectorymode.xml b/docs-xml/smbdotconf/security/forcedirectorymode.xml
index e5b37ea611fb3d2cb128cf0fbb3689c3ec2c172f..7effc0e3999a526bfc03d0fa9d7b2cfedec39521 100644 (file)
--- a/docs-xml/smbdotconf/security/forcedirectorymode.xml
+++ b/docs-xml/smbdotconf/security/forcedirectorymode.xml
@@ -12,12 +12,6 @@
     mask in the parameter <parameter moreinfo="none">directory mask</parameter> is 
     applied.</para>
 
-    <para>
-    New in Samba 4.0.0. This mode is also 'OR'ed into the mode bits whenever
-    permissions are changed on a directory, not just when the file is created.
-    This replaces the now removed <parameter moreinfo="none">force directory security mode</parameter>.
-    </para>
-
        <para>The example below would force all created directories to have read and execute
     permissions set for 'group' and 'other' as well as the
     read/write/execute bits set for the 'user'.</para>

diff --git a/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml b/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
index 3ea3b5c1e1e67139d28b067bfd2e925fc2549ba4..a45395d106d94a8ce1d55dac7be305b5f432441c 100644 (file)
--- a/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
+++ b/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
@@ -5,10 +5,7 @@
                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
-       This parameter has been removed for Samba 4.0.0. The parameter
-       <smbconfoption name="force directory mode"/> is now used instead to
-       force any permission changes on directories to include specific UNIX
-       permission bits.
+       This parameter has been removed for Samba 4.0.0.
     </para>
 </description>
 </samba:parameter>

diff --git a/docs-xml/smbdotconf/security/forcesecuritymode.xml b/docs-xml/smbdotconf/security/forcesecuritymode.xml
index 2568bccb4e779d9757fd618894624d63048e4050..5a9479e8993ee0d5b9233840797de9086c3951b1 100644 (file)
--- a/docs-xml/smbdotconf/security/forcesecuritymode.xml
+++ b/docs-xml/smbdotconf/security/forcesecuritymode.xml
@@ -5,10 +5,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
-       This parameter has been removed for Samba 4.0.0. The parameter
-       <smbconfoption name="force create mode"/> is now used instead to
-       force any permission changes on files to include specific UNIX
-       permission bits.
+       This parameter has been removed for Samba 4.0.0.
     </para>
 </description>
 </samba:parameter>

diff --git a/docs-xml/smbdotconf/security/securitymask.xml b/docs-xml/smbdotconf/security/securitymask.xml
index cb7fcfa20fe9a09b441f20c2c8357b6dfb488b5a..e535d32982c5144a91d48904edff3bf3208b4d81 100644 (file)
--- a/docs-xml/smbdotconf/security/securitymask.xml
+++ b/docs-xml/smbdotconf/security/securitymask.xml
@@ -5,9 +5,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
-       This parameter has been removed for Samba 4.0.0. The parameter
-       <smbconfoption name="create mask"/> is now used instead to mask
-       any permission bit changes on files.
+       This parameter has been removed for Samba 4.0.0.
     </para>
 </description>
 </samba:parameter>