summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-07-03 10:24:12 -0700
committerJeremy Allison <jra@samba.org>2008-07-03 10:24:12 -0700
commit1fb1c67fb9392364887ba8963f18d10b27d1cfa0 (patch)
tree74776d9df480eb982a762e740880b303d0571c12 /docs-xml
parentb611fd9550b3d24711f2006d0489e28e1d8c31f5 (diff)
downloadsamba-1fb1c67fb9392364887ba8963f18d10b27d1cfa0.tar.gz
samba-1fb1c67fb9392364887ba8963f18d10b27d1cfa0.tar.bz2
samba-1fb1c67fb9392364887ba8963f18d10b27d1cfa0.zip
Patch from SATOH Fumiyasu <fumiyas@osstech.co.jp> for bug #5202. Re-activate "acl group control"
parameter and make it only apply to owning group. Also added man page fix. Jeremy. (This used to be commit e98e080bad2c8b9f038a8f2dffcfeba1d5f392ce)
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/smbdotconf/misc/dosfilemode.xml17
-rw-r--r--docs-xml/smbdotconf/security/aclgroupcontrol.xml6
2 files changed, 13 insertions, 10 deletions
diff --git a/docs-xml/smbdotconf/misc/dosfilemode.xml b/docs-xml/smbdotconf/misc/dosfilemode.xml
index ae3b475107..e67ccd935a 100644
--- a/docs-xml/smbdotconf/misc/dosfilemode.xml
+++ b/docs-xml/smbdotconf/misc/dosfilemode.xml
@@ -3,15 +3,16 @@
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para> The default behavior in Samba is to provide
- UNIX-like behavior where only the owner of a file/directory is
+ <para> The default behavior in Samba is to provide
+ UNIX-like behavior where only the owner of a file/directory is
able to change the permissions on it. However, this behavior
- is often confusing to DOS/Windows users. Enabling this parameter
- allows a user who has write access to the file (by whatever
- means) to modify the permissions (including ACL) on it. Note that a user
- belonging to the group owning the file will not be allowed to
- change permissions if the group is only granted read access.
- Ownership of the file/directory may also be changed.</para>
+ is often confusing to DOS/Windows users. Enabling this parameter
+ allows a user who has write access to the file (by whatever
+ means, including an ACL permission) to modify the permissions
+ (including ACL) on it. Note that a user belonging to the group
+ owning the file will not be allowed to change permissions if
+ the group is only granted read access. Ownership of the
+ file/directory may also be changed.</para>
</description>
<value type="default">no</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/aclgroupcontrol.xml b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
index e2600ca9da..6efd46dd8d 100644
--- a/docs-xml/smbdotconf/security/aclgroupcontrol.xml
+++ b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
@@ -30,8 +30,10 @@
</para>
<para>
- This is parameter has been marked deprecated in Samba 3.0.23. The same behavior is now
- implemented by the <parameter moreinfo="none">dos filemode</parameter> option.
+ This is parameter has been was deprecated in Samba 3.0.23, but re-activated in
+ Samba 3.0.31 and above, as it now only controls permission changes if the user
+ is in the owning primary group. It is now no longer equivalent to the
+ <parameter moreinfo="none">dos filemode</parameter> option.
</para>
</description>