summaryrefslogtreecommitdiff
path: root/docs/smbdotconf
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-08-23 19:50:44 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:36 -0500
commit41bb30bde0a00615a7251dd44dae0585022af0df (patch)
treef189b89498674574c34770dd823cf3cdeca7385a /docs/smbdotconf
parentb127aae16469da11bb5ffa8f63ead673f001f7a9 (diff)
downloadsamba-41bb30bde0a00615a7251dd44dae0585022af0df.tar.gz
samba-41bb30bde0a00615a7251dd44dae0585022af0df.tar.bz2
samba-41bb30bde0a00615a7251dd44dae0585022af0df.zip
Update "*securitymask* docs to match the code.
Jeremy. (This used to be commit f1fd69d9b5c3617e6b789df5a4cc3b79931a1e48)
Diffstat (limited to 'docs/smbdotconf')
-rw-r--r--docs/smbdotconf/security/directorysecuritymask.xml10
-rw-r--r--docs/smbdotconf/security/securitymask.xml10
2 files changed, 10 insertions, 10 deletions
diff --git a/docs/smbdotconf/security/directorysecuritymask.xml b/docs/smbdotconf/security/directorysecuritymask.xml
index a16f275698..352e892f1c 100644
--- a/docs/smbdotconf/security/directorysecuritymask.xml
+++ b/docs/smbdotconf/security/directorysecuritymask.xml
@@ -4,19 +4,19 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter controls what UNIX permission bits
- can be modified when a Windows NT client is manipulating the UNIX
+ can be set when a Windows NT client is manipulating the UNIX
permission on a directory using the native NT security dialog
box.</para>
<para>
- This parameter is applied as a mask (AND'ed with) to the changed permission bits, thus preventing any bits not
- in this mask from being modified. Make sure not to mix up this parameter with <smbconfoption name="force
+ This parameter is applied as a mask (AND'ed with) to the incoming permission bits, thus preventing any bits not
+ in this mask from being set. Make sure not to mix up this parameter with <smbconfoption name="force
directory security mode"/>, which works similar like this one but uses logical OR instead of AND.
- Essentially, zero bits in this mask may be treated as a set of bits the user is not allowed to change.
+ Essentially, zero bits in this mask are a set of bits that will always be set to zero.
</para>
<para>If not set explicitly this parameter is set to 0777
- meaning a user is allowed to modify all the user/group/world
+ meaning a user is allowed to set all the user/group/world
permissions on a directory.</para>
<para><emphasis>Note</emphasis> that users who can access the
diff --git a/docs/smbdotconf/security/securitymask.xml b/docs/smbdotconf/security/securitymask.xml
index d41d6bddae..1cf6e09a46 100644
--- a/docs/smbdotconf/security/securitymask.xml
+++ b/docs/smbdotconf/security/securitymask.xml
@@ -4,22 +4,22 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
- This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating the
+ This parameter controls what UNIX permission bits can be set when a Windows NT client is manipulating the
UNIX permission on a file using the native NT security dialog box.
</para>
<para>
- This parameter is applied as a mask (AND'ed with) to the changed permission bits, thus preventing any bits not
- in this mask from being modified. Make sure not to mix up this parameter with <smbconfoption name="force
+ This parameter is applied as a mask (AND'ed with) to the incoming permission bits, thus preventing any bits not
+ in this mask from being set. Make sure not to mix up this parameter with <smbconfoption name="force
security mode"/>, which works in a manner similar to this one but uses a logical OR instead of an AND.
</para>
<para>
- Essentially, zero bits in this mask may be treated as a set of bits the user is not allowed to change.
+ Essentially, zero bits in this mask are a set of bits that will always be set to zero.
</para>
<para>
- If not set explicitly this parameter is 0777, allowing a user to modify all the user/group/world permissions on a file.
+ If not set explicitly this parameter is 0777, allowing a user to set all the user/group/world permissions on a file.
</para>
<para><emphasis>