From 8ca4b7597d91355c4885b8ab89b0996c98f5c805 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 6 May 2013 14:10:58 -0700 Subject: [PATCH] Fix up the man pages to explain that "store dos attributes" overrides them. Signed-off-by: Jeremy Allison Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue May 7 01:24:54 CEST 2013 on sn-devel-104 --- docs-xml/smbdotconf/filename/maparchive.xml | 6 ++++++ docs-xml/smbdotconf/filename/maphidden.xml | 6 ++++++ docs-xml/smbdotconf/filename/mapreadonly.xml | 6 ++++++ docs-xml/smbdotconf/filename/mapsystem.xml | 6 ++++++ docs-xml/smbdotconf/filename/storedosattributes.xml | 4 ++-- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/docs-xml/smbdotconf/filename/maparchive.xml b/docs-xml/smbdotconf/filename/maparchive.xml index ead72cf25a1..33ff876c74b 100644 --- a/docs-xml/smbdotconf/filename/maparchive.xml +++ b/docs-xml/smbdotconf/filename/maparchive.xml @@ -12,6 +12,12 @@ be quite annoying for shared source code, documents, etc... + + Note that this parameter will be ignored if the + parameter is set, as the DOS archive attribute will then be stored inside a UNIX extended + attribute. + + Note that this requires the parameter to be set such that owner execute bit is not masked out (i.e. it must include 100). See the parameter diff --git a/docs-xml/smbdotconf/filename/maphidden.xml b/docs-xml/smbdotconf/filename/maphidden.xml index 841c6876e62..004f493ec94 100644 --- a/docs-xml/smbdotconf/filename/maphidden.xml +++ b/docs-xml/smbdotconf/filename/maphidden.xml @@ -7,6 +7,12 @@ This controls whether DOS style hidden files should be mapped to the UNIX world execute bit. + + Note that this parameter will be ignored if the + parameter is set, as the DOS hidden attribute will then be stored inside a UNIX extended + attribute. + + Note that this requires the to be set such that the world execute bit is not masked out (i.e. it must include 001). See the parameter diff --git a/docs-xml/smbdotconf/filename/mapreadonly.xml b/docs-xml/smbdotconf/filename/mapreadonly.xml index 24a2c841432..f4ac7c8014c 100644 --- a/docs-xml/smbdotconf/filename/mapreadonly.xml +++ b/docs-xml/smbdotconf/filename/mapreadonly.xml @@ -42,6 +42,12 @@ + + Note that this parameter will be ignored if the + parameter is set, as the DOS 'read-only' attribute will then be stored inside a UNIX extended + attribute. + + yes diff --git a/docs-xml/smbdotconf/filename/mapsystem.xml b/docs-xml/smbdotconf/filename/mapsystem.xml index 021602d5785..5605d8860a0 100644 --- a/docs-xml/smbdotconf/filename/mapsystem.xml +++ b/docs-xml/smbdotconf/filename/mapsystem.xml @@ -7,6 +7,12 @@ This controls whether DOS style system files should be mapped to the UNIX group execute bit. + + Note that this parameter will be ignored if the + parameter is set, as the DOS system attribute will then be stored inside a UNIX extended + attribute. + + Note that this requires the to be set such that the group execute bit is not masked out (i.e. it must include 010). See the parameter diff --git a/docs-xml/smbdotconf/filename/storedosattributes.xml b/docs-xml/smbdotconf/filename/storedosattributes.xml index 621b4ace742..acd78b076ee 100644 --- a/docs-xml/smbdotconf/filename/storedosattributes.xml +++ b/docs-xml/smbdotconf/filename/storedosattributes.xml @@ -8,9 +8,9 @@ READ-ONLY) from a filesystem extended attribute, before mapping DOS attributes to UNIX permission bits (such as occurs with and ). When set, DOS attributes will be stored onto an extended attribute in the UNIX filesystem, associated with the file or - directory. For no other mapping to occur as a fall-back, the parameters , + directory. When this parameter is set it will override the parameters , , and must be set to off. This parameter writes the DOS attributes as a string into the extended + readonly"/> and they will behave as if they were set to off. This parameter writes the DOS attributes as a string into the extended attribute named "user.DOSATTRIB". This extended attribute is explicitly hidden from smbd clients requesting an EA list. On Linux the filesystem must have been mounted with the mount option user_xattr in order for extended attributes to work, also extended attributes must be compiled into the Linux kernel. -- 2.34.1