The branch, v4-5-test has been updated via bcc2c63 manpages/vfs_fruit: add warning to fruit:resoure=stream via c764cc4 manpages/vfs_fruit: fruit:resource option misspelling from 91a3133 Merge tag 'samba-4.5.2' into v4-5-test
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-5-test - Log ----------------------------------------------------------------- commit bcc2c63496a80065e240d6ea17cb868e7412d1de Author: Ralph Boehme <s...@samba.org> Date: Thu Nov 10 09:07:41 2016 +0100 manpages/vfs_fruit: add warning to fruit:resoure=stream BUG: https://bugzilla.samba.org/show_bug.cgi?id=12412 Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(v4-5-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-5-test): Thu Dec 8 13:06:28 CET 2016 on sn-devel-144 commit c764cc4af77d2b71dea912ec8141b62c33167e0a Author: Ralph Boehme <s...@samba.org> Date: Thu Nov 10 08:57:12 2016 +0100 manpages/vfs_fruit: fruit:resource option misspelling Due to a misspelling in the option parser in all Samba versions up to and including 4.5.1 this options must be given "fruit:ressource", ie with two "s". Samba 4.6 will accept both the correct the correct and the wrong spelling, Samba 4.7 onwards will only accept the correct spelling. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12412 Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: docs-xml/manpages/vfs_fruit.8.xml | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/vfs_fruit.8.xml b/docs-xml/manpages/vfs_fruit.8.xml index 0d97e58..a0b3893 100644 --- a/docs-xml/manpages/vfs_fruit.8.xml +++ b/docs-xml/manpages/vfs_fruit.8.xml @@ -86,7 +86,27 @@ <varlistentry> <term>fruit:resource = [ file | xattr | stream ]</term> <listitem> - <para>Controls where the OS X resource fork is stored:</para> + <para>Controls where the OS X resource fork is stored.</para> + + <para><emphasis>Important: </emphasis>Due to a + misspelling in the option parser in all Samba versions + 4.5 and earlier, this options must be given as + <emphasis>fruit:ressource</emphasis>, ie with two + <emphasis>s</emphasis>.</para> + + <para>Users who set this opion to any non-default + setting were still using the default setting of + <emphasis>file</emphasis> and are advised to adjust + their smb.conf to reflect the effective setting and set + <emphasis>fruit:ressource=file</emphasis> in their + smb.conf. Removing the option line altogether works as + well.</para> + + <para>Samba 4.6 will accept both the correct and the + wrong spelling, from Samba 4.7 onwards only the correct + spelling will be accepted.</para> + + <para>Settings:</para> <itemizedlist> <listitem><para><command>file (default)</command> - use a ._ @@ -99,9 +119,12 @@ down to Solaris and derived platforms and ZFS</para></listitem> - <listitem><para><command>stream</command> - pass the - stream on to the next module in the VFS - stack</para></listitem> + <listitem><para><command>stream (experimental)</command> - pass + the stream on to the next module in the VFS stack. + <emphasis>Warning: </emphasis> this option should not be used + with the <emphasis>streams_xattr</emphasis> module due to the + extended attributes size limitations of most + filesytems.</para></listitem> </itemizedlist> </listitem> -- Samba Shared Repository