diff options
| author | Jeremy Allison <jra@samba.org> | 2008-07-03 10:25:26 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-07-06 22:31:15 +0200 |
| commit | f130de5441160b53a0dceb5d102fe2783b067048 (patch) | |
| tree | 47ed16f86dd9923cd841f9b2a3908f54225c5307 /docs-xml | |
| parent | d30d79090e182f96ebcbe5f28d5c018341076569 (diff) | |
| download | samba-f130de5441160b53a0dceb5d102fe2783b067048.tar.gz | |
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.
(cherry picked from commit 93e91e5364a7f131d988648cf5fe822a9bd68734)
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/smbdotconf/misc/dosfilemode.xml | 17 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/security/aclgroupcontrol.xml | 6 |
2 files changed, 13 insertions, 10 deletions
diff --git a/docs-xml/smbdotconf/misc/dosfilemode.xml b/docs-xml/smbdotconf/misc/dosfilemode.xml index ae3b475107b..e67ccd935a5 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 e2600ca9da5..6efd46dd8dc 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> |