[SCM] Samba Shared Repository - branch v4-4-test updated
Karolin Seeger
kseeger at samba.org
Tue Feb 9 09:32:48 UTC 2016
The branch, v4-4-test has been updated
via 0a0276b VERSION: Bump version up to 4.4.0rc3...
via 186206f VERSION: Disable git snapshots for the Samba 4.4.0rc2 release.
via 0a81ac4 WHATSNEW: Add release notes for Samba 4.4.0rc2.
via f3cfe82 docs-xml: fix typo in smbspool_krb5_wrapper manpage.
via b6a6011 docs: Add smbspool_krb5_wrapper manpage
via ac49d96 s3:vfs:glusterfs: fix build after quota changes.
from 7d7a14f python:tests/core: add tests for arcfour_encrypt() and string_to_byte_array()
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test
- Log -----------------------------------------------------------------
commit 0a0276b3731b276e0533ab674b3f9ec67f5310bb
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Feb 9 10:24:11 2016 +0100
VERSION: Bump version up to 4.4.0rc3...
...and re-enable git snapshots.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
commit 186206fdf1a4783fc37ff5f2b8dadadfa3c114c2
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Feb 9 10:23:08 2016 +0100
VERSION: Disable git snapshots for the Samba 4.4.0rc2 release.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
commit 0a81ac44913dddab1748b531800a9a0a95ec9ebb
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Feb 9 10:21:46 2016 +0100
WHATSNEW: Add release notes for Samba 4.4.0rc2.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
commit f3cfe822515af162ddf89bae7f76479f2131ba87
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 4 00:00:46 2016 +0100
docs-xml: fix typo in smbspool_krb5_wrapper manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 109164ed63ee76c4088f5df7ffb66740cac629c1)
commit b6a6011d913cc642e2b5bc2f6a5f2a503b0e0067
Author: Andreas Schneider <asn at samba.org>
Date: Wed Feb 3 09:20:27 2016 +0100
docs: Add smbspool_krb5_wrapper manpage
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11690
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Karolin Seeger <kseeger at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Wed Feb 3 21:25:54 CET 2016 on sn-devel-144
(cherry picked from commit 4c54901102440ba9cbd96b349e95e3127415614a)
commit ac49d96546035a854a7dc1eff16d0f04d5aa1c1c
Author: Michael Adam <obnox at samba.org>
Date: Mon Feb 1 16:06:18 2016 +0100
s3:vfs:glusterfs: fix build after quota changes.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11715
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Uri Simchoni <uri at samba.org>
Autobuild-User(master): Uri Simchoni <uri at samba.org>
Autobuild-Date(master): Mon Feb 1 22:09:18 CET 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 33 +++++++++++++-
docs-xml/manpages/smbspool_krb5_wrapper.8.xml | 64 +++++++++++++++++++++++++++
docs-xml/wscript_build | 1 +
source3/modules/vfs_glusterfs.c | 1 +
5 files changed, 99 insertions(+), 2 deletions(-)
create mode 100644 docs-xml/manpages/smbspool_krb5_wrapper.8.xml
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index 1c22759..40dc91d 100644
--- a/VERSION
+++ b/VERSION
@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=2
+SAMBA_VERSION_RC_RELEASE=3
########################################################
# To mark SVN snapshots this should be set to 'yes' #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 7c748c2..3805f5f 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,7 +1,7 @@
Release Announcements
=====================
-This is the first release candidate of Samba 4.4. This is *not*
+This is the second release candidate of Samba 4.4. This is *not*
intended for production environments and is designed for testing
purposes only. Please report any defects via the Samba bug reporting
system at https://bugzilla.samba.org/.
@@ -234,6 +234,37 @@ KNOWN ISSUES
Currently none.
+
+CHANGES SINCE 4.4.0rc1
+======================
+
+o Michael Adam <obnox at samba.org>
+ * BUG 11715: s3:vfs:glusterfs: Fix build after quota changes.
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 11703: s3: smbd: Fix timestamp rounding inside SMB2 create.
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 11700: Streamline 'smbget' options with the rest of the Samba utils.
+
+o Günther Deschner <gd at samba.org>
+ * BUG 11696: ctdb: Do not provide a useless pkgconfig file for ctdb.
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 11699: Crypto.Cipher.ARC4 is not available on some platforms, fallback
+ to M2Crypto.RC4.RC4 then.
+
+o Amitay Isaacs <amitay at gmail.com>
+ * BUG 11705: Sockets with htons(IPPROTO_RAW) and CVE-2015-8543.
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 11690: docs: Add smbspool_krb5_wrapper manpage.
+
+o Uri Simchoni <uri at samba.org>
+ * BUG 11681: smbd: Show correct disk size for different quota and dfree block
+ sizes.
+
+
#######################################
Reporting bugs & Development Discussion
#######################################
diff --git a/docs-xml/manpages/smbspool_krb5_wrapper.8.xml b/docs-xml/manpages/smbspool_krb5_wrapper.8.xml
new file mode 100644
index 0000000..f9966e7
--- /dev/null
+++ b/docs-xml/manpages/smbspool_krb5_wrapper.8.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="smbspool.8">
+
+<refmeta>
+ <refentrytitle>smbspool_krb5_wrapper</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.4</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>smbspool_krb5_wrapper</refname>
+ <refpurpose>This is a CUPS printing backend which calls smbspool</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>smbspool_krb5_wrapper</command>
+ <arg choice="req">job</arg>
+ <arg choice="req">user</arg>
+ <arg choice="req">title</arg>
+ <arg choice="req">copies</arg>
+ <arg choice="req">options</arg>
+ <arg choice="opt">filename</arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>smbspool_krb5_wrapper is a tool that can be used to print using
+ Kerberos credentials. To get this working smbspool_krb5_wrapper
+ needs to be the smb backend of CUPS. It needs to be owned by
+ root and the permissions for the binary need to be 0700. Once
+ smbspool_krb5_wrapper switched to the user trying to print it
+ executes smbspool. It should not be called by a user.</para>
+
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para><citerefentry><refentrytitle>smbspool</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>.</para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</para>
+
+ <para>The smbspool_krb5_wrapper manpage was written by Andreas
+ Schneider.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 2cff3c1..3a87ad1 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -38,6 +38,7 @@ manpages='''
manpages/smbpasswd.5
manpages/smbpasswd.8
manpages/smbspool.8
+ manpages/smbspool_krb5_wrapper.8
manpages/smbstatus.1
manpages/smbtar.1
manpages/smbtree.1
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index f32f598..427b985 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -296,6 +296,7 @@ static uint64_t vfs_gluster_disk_free(struct vfs_handle_struct *handle,
}
static int vfs_gluster_get_quota(struct vfs_handle_struct *handle,
+ const char *path,
enum SMB_QUOTA_TYPE qtype, unid_t id,
SMB_DISK_QUOTA *qt)
{
--
Samba Shared Repository
More information about the samba-cvs
mailing list