summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-12-04 15:47:06 -0800
committerJeremy Allison <jra@samba.org>2012-12-05 16:35:07 -0800
commit1ff1597e1feb45fd54b0d8dc6d8eabc7ace9073a (patch)
tree386cd12fb536911378f162eadb5c3e0417012d06
parent2013bb9b4dbed747921df2591068e2765428f57d (diff)
downloadsamba-1ff1597e1feb45fd54b0d8dc6d8eabc7ace9073a.tar.gz
samba-1ff1597e1feb45fd54b0d8dc6d8eabc7ace9073a.tar.bz2
samba-1ff1597e1feb45fd54b0d8dc6d8eabc7ace9073a.zip
Documentation fixes for bug #9462 - Users can not be given write permissions any more by default
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>
-rw-r--r--docs-xml/smbdotconf/security/createmask.xml5
-rw-r--r--docs-xml/smbdotconf/security/directorymask.xml5
-rw-r--r--docs-xml/smbdotconf/security/directorysecuritymask.xml4
-rw-r--r--docs-xml/smbdotconf/security/forcecreatemode.xml6
-rw-r--r--docs-xml/smbdotconf/security/forcedirectorymode.xml6
-rw-r--r--docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml5
-rw-r--r--docs-xml/smbdotconf/security/forcesecuritymode.xml5
-rw-r--r--docs-xml/smbdotconf/security/securitymask.xml4
8 files changed, 4 insertions, 36 deletions
diff --git a/docs-xml/smbdotconf/security/createmask.xml b/docs-xml/smbdotconf/security/createmask.xml
index 59e208dccd..5df07188d6 100644
--- 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 2ebfc16d14..b17625c95b 100644
--- 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 c5c8c65b2c..ad208f4e2a 100644
--- 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 5a57a294af..a3f1c2c105 100644
--- 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 e5b37ea611..7effc0e399 100644
--- 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 3ea3b5c1e1..a45395d106 100644
--- 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 2568bccb4e..5a9479e899 100644
--- 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 cb7fcfa20f..e535d32982 100644
--- 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>