The branch, v4-4-test has been updated
via 764444d manpages/vfs_fruit: add warning to fruit:resoure=stream
via 37031cb manpages/vfs_fruit: fruit:resource option misspelling
via 584107b printing: Fix building with CUPS version older than 1.7
from cab4fa0 s3/smbd: fix the last resort check that sets the file type
attribute
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test
- Log -----------------------------------------------------------------
commit 764444d1191f6554d9137ef5bd280b38c6740878
Author: Ralph Boehme <[email protected]>
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 <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Thu Dec 8 14:52:52 CET 2016 on sn-devel-144
commit 37031cbd4a50dd3656bbe60478fb5e4c1ee3fb04
Author: Ralph Boehme <[email protected]>
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 <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 584107b7f310900701d9144ffd0a281dde7ab64e
Author: Andreas Schneider <[email protected]>
Date: Tue Dec 6 09:44:28 2016 +0100
printing: Fix building with CUPS version older than 1.7
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12183
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Karolin Seeger <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_fruit.8.xml | 31 +++++++++++++++++++++++++++----
source3/printing/print_cups.c | 6 ++++++
2 files changed, 33 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 a275344..0f4d941 100644
--- a/docs-xml/manpages/vfs_fruit.8.xml
+++ b/docs-xml/manpages/vfs_fruit.8.xml
@@ -78,7 +78,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 ._
@@ -91,9 +111,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>
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 673a150..7c4d35d 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -31,6 +31,12 @@
#ifdef HAVE_CUPS
#include <cups/cups.h>
#include <cups/language.h>
+#include <cups/http.h>
+
+/* CUPS prior to version 1.7 doesn't have HTTP_URI_STATUS_OK */
+#if (CUPS_VERSION_MAJOR == 1) && (CUPS_VERSION_MINOR < 7)
+#define HTTP_URI_STATUS_OK HTTP_URI_OK
+#endif
#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
#define HAVE_CUPS_1_6 1
--
Samba Shared Repository
