The branch, v4-4-stable has been updated
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.
via 7d7a14f python:tests/core: add tests for arcfour_encrypt() and
string_to_byte_array()
via d6db609 s4:scripting/devel: make use of the generic
arcfour_encrypt() and string_to_byte_array() functions
via e91612e python:samba/netcmd/domain: make use of the generic
arcfour_encrypt() and string_to_byte_array() functions
via 9517f4b python:samba/join.py: make use of the generic
arcfour_encrypt() and string_to_byte_array() functions
via 280ccf1 python:samba: add a generic arcfour_encrypt() helper
function
via 04b2073 python:samba: add a generic string_to_byte_array() helper
function
via fe875f3 ctdb-common: Use documented names for protocol family in
socket()
via 522c1c5 ctdb-common: Protocol argument must be in host order for
socket() call
via f2dc71c s3: smbd: Fix timestamp rounding inside SMB2 create.
via 9eed186 WHATSNEW: update with latest parameter updates for smbget
via 2978226 s3-utils/smbget: Update manpages for parameter changes
via a7046bc s3-utils/smbget: Fix user-/name password reading from rcfile
via 9d4cbe6 s3-utils/smbget: Fix reading the rcfile
via 1ebeb06 s3-utils/smbget: Fix option parsing and apply samba defaults
via 2aadb75 selftest: fix test_dfree_quota.sh
via 3029dc0 ctdb: do not provide a useless pkgconfig file for ctdb.
via 7da9c65 smbd: show correct disk size for different quota and dfree
block sizes
via 1133650 VERSION: Bump version up to 4.4.0rc2...
from 6c547b3 VERSION: Set version to 4.4.0rc1...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 40 +++++-
ctdb/common/system_aix.c | 4 +-
ctdb/common/system_common.c | 2 +-
ctdb/common/system_freebsd.c | 4 +-
ctdb/common/system_gnu.c | 4 +-
ctdb/common/system_kfreebsd.c | 4 +-
ctdb/common/system_linux.c | 12 +-
ctdb/ctdb.pc.in | 19 ---
ctdb/packaging/RPM/ctdb.spec.in | 1 -
ctdb/tools/ctdb.c | 4 +-
ctdb/utils/smnotify/smnotify.c | 6 +-
ctdb/wscript | 9 --
docs-xml/manpages/smbget.1.xml | 16 +--
docs-xml/manpages/smbgetrc.5.xml | 8 +-
docs-xml/manpages/smbspool_krb5_wrapper.8.xml | 64 +++++++++
docs-xml/wscript_build | 1 +
python/samba/__init__.py | 24 ++++
python/samba/join.py | 19 +--
python/samba/netcmd/domain.py | 23 +---
python/samba/tests/core.py | 16 +++
source3/modules/vfs_glusterfs.c | 1 +
source3/script/tests/test_dfree_quota.sh | 4 +-
source3/smbd/dfree.c | 9 +-
source3/smbd/smb2_create.c | 8 ++
source3/utils/smbget.c | 185 ++++++++++++++++----------
source4/scripting/devel/createtrust | 18 +--
27 files changed, 317 insertions(+), 190 deletions(-)
delete mode 100644 ctdb/ctdb.pc.in
create mode 100644 docs-xml/manpages/smbspool_krb5_wrapper.8.xml
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index eba23fc..f254fd5 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=1
+SAMBA_VERSION_RC_RELEASE=2
########################################################
# To mark SVN snapshots this should be set to 'yes' #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 399fb2b..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/.
@@ -65,6 +65,13 @@ smbstatus
'smbstatus' was enhanced to show the state of signing and encryption for
sessions and shares.
+smbget
+------
+The -u and -p options for user and password were replaced by the -U option that
+accepts username[%password] as in many other tools of the Samba suite.
+Similary, smbgetrc files do not accept username and password options any more,
+only a single "user" option which also accepts user%password combinations.
+
s4-rpc_server
-------------
@@ -227,6 +234,37 @@ KNOWN ISSUES
Currently none.
+
+CHANGES SINCE 4.4.0rc1
+======================
+
+o Michael Adam <ob...@samba.org>
+ * BUG 11715: s3:vfs:glusterfs: Fix build after quota changes.
+
+o Jeremy Allison <j...@samba.org>
+ * BUG 11703: s3: smbd: Fix timestamp rounding inside SMB2 create.
+
+o Christian Ambach <a...@samba.org>
+ * BUG 11700: Streamline 'smbget' options with the rest of the Samba utils.
+
+o Günther Deschner <g...@samba.org>
+ * BUG 11696: ctdb: Do not provide a useless pkgconfig file for ctdb.
+
+o Stefan Metzmacher <me...@samba.org>
+ * BUG 11699: Crypto.Cipher.ARC4 is not available on some platforms, fallback
+ to M2Crypto.RC4.RC4 then.
+
+o Amitay Isaacs <ami...@gmail.com>
+ * BUG 11705: Sockets with htons(IPPROTO_RAW) and CVE-2015-8543.
+
+o Andreas Schneider <a...@samba.org>
+ * BUG 11690: docs: Add smbspool_krb5_wrapper manpage.
+
+o Uri Simchoni <u...@samba.org>
+ * BUG 11681: smbd: Show correct disk size for different quota and dfree
block
+ sizes.
+
+
#######################################
Reporting bugs & Development Discussion
#######################################
diff --git a/ctdb/common/system_aix.c b/ctdb/common/system_aix.c
index d323e5c..2d35a22 100644
--- a/ctdb/common/system_aix.c
+++ b/ctdb/common/system_aix.c
@@ -50,7 +50,7 @@ int ctdb_sys_open_sending_socket(void)
int s, ret;
uint32_t one = 1;
- s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW));
+ s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT,(" failed to open raw socket (%s)\n",
strerror(errno)));
@@ -127,7 +127,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
- s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW));
+ s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT,(" failed to open raw socket (%s)\n",
strerror(errno)));
diff --git a/ctdb/common/system_common.c b/ctdb/common/system_common.c
index e11bcb2..a80189c 100644
--- a/ctdb/common/system_common.c
+++ b/ctdb/common/system_common.c
@@ -90,7 +90,7 @@ char *ctdb_sys_find_ifname(ctdb_sock_addr *addr)
struct ifconf ifc;
char *ptr;
- s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW));
+ s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket
(%s)\n",
strerror(errno)));
diff --git a/ctdb/common/system_freebsd.c b/ctdb/common/system_freebsd.c
index e88e9e2..37e4bae 100644
--- a/ctdb/common/system_freebsd.c
+++ b/ctdb/common/system_freebsd.c
@@ -164,7 +164,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
ip4pkt.tcp.th_sum = tcp_checksum((uint16_t *)&ip4pkt.tcp,
sizeof(ip4pkt.tcp), &ip4pkt.ip);
/* open a raw socket to send this segment from */
- s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW));
+ s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw
socket (%s)\n",
strerror(errno)));
@@ -214,7 +214,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
ip6pkt.tcp.th_win = htons(1234);
ip6pkt.tcp.th_sum = tcp_checksum6((uint16_t *)&ip6pkt.tcp,
sizeof(ip6pkt.tcp), &ip6pkt.ip6);
- s = socket(PF_INET6, SOCK_RAW, IPPROTO_RAW);
+ s = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT, (__location__ " Failed to open
sending socket\n"));
return -1;
diff --git a/ctdb/common/system_gnu.c b/ctdb/common/system_gnu.c
index 1246205..e5b8e05 100644
--- a/ctdb/common/system_gnu.c
+++ b/ctdb/common/system_gnu.c
@@ -162,7 +162,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
ip4pkt.tcp.check = tcp_checksum((uint16_t *)&ip4pkt.tcp,
sizeof(ip4pkt.tcp), &ip4pkt.ip);
/* open a raw socket to send this segment from */
- s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW));
+ s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw
socket (%s)\n",
strerror(errno)));
@@ -209,7 +209,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
ip6pkt.tcp.window = htons(1234);
ip6pkt.tcp.check = tcp_checksum6((uint16_t *)&ip6pkt.tcp,
sizeof(ip6pkt.tcp), &ip6pkt.ip6);
- s = socket(PF_INET6, SOCK_RAW, IPPROTO_RAW);
+ s = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT, (__location__ " Failed to open
sending socket\n"));
return -1;
diff --git a/ctdb/common/system_kfreebsd.c b/ctdb/common/system_kfreebsd.c
index b030317..4be678d 100644
--- a/ctdb/common/system_kfreebsd.c
+++ b/ctdb/common/system_kfreebsd.c
@@ -162,7 +162,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
ip4pkt.tcp.check = tcp_checksum((uint16_t *)&ip4pkt.tcp,
sizeof(ip4pkt.tcp), &ip4pkt.ip);
/* open a raw socket to send this segment from */
- s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW));
+ s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw
socket (%s)\n",
strerror(errno)));
@@ -209,7 +209,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
ip6pkt.tcp.window = htons(1234);
ip6pkt.tcp.check = tcp_checksum6((uint16_t *)&ip6pkt.tcp,
sizeof(ip6pkt.tcp), &ip6pkt.ip6);
- s = socket(PF_INET6, SOCK_RAW, IPPROTO_RAW);
+ s = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT, (__location__ " Failed to open
sending socket\n"));
return -1;
diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c
index 55c22c5..d523617 100644
--- a/ctdb/common/system_linux.c
+++ b/ctdb/common/system_linux.c
@@ -100,7 +100,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const
char *iface)
switch (addr->ip.sin_family) {
case AF_INET:
- s = socket(PF_PACKET, SOCK_RAW, htons(ETHERTYPE_ARP));
+ s = socket(AF_PACKET, SOCK_RAW, ETHERTYPE_ARP);
if (s == -1){
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw
socket\n"));
return -1;
@@ -194,7 +194,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const
char *iface)
close(s);
break;
case AF_INET6:
- s = socket(PF_PACKET, SOCK_RAW, htons(ETHERTYPE_ARP));
+ s = socket(AF_PACKET, SOCK_RAW, ETHERTYPE_ARP);
if (s == -1){
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw
socket\n"));
return -1;
@@ -370,7 +370,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
ip4pkt.tcp.check = tcp_checksum((uint16_t *)&ip4pkt.tcp,
sizeof(ip4pkt.tcp), &ip4pkt.ip);
/* open a raw socket to send this segment from */
- s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW));
+ s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw
socket (%s)\n",
strerror(errno)));
@@ -419,7 +419,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
ip6pkt.tcp.window = htons(1234);
ip6pkt.tcp.check = tcp_checksum6((uint16_t *)&ip6pkt.tcp,
sizeof(ip6pkt.tcp), &ip6pkt.ip6);
- s = socket(PF_INET6, SOCK_RAW, IPPROTO_RAW);
+ s = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW);
if (s == -1) {
DEBUG(DEBUG_CRIT, (__location__ " Failed to open
sending socket\n"));
return -1;
@@ -460,7 +460,7 @@ int ctdb_sys_open_capture_socket(const char *iface, void
**private_data)
int s;
/* Open a socket to capture all traffic */
- s = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
+ s = socket(AF_PACKET, SOCK_RAW, ETH_P_ALL);
if (s == -1) {
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n"));
return -1;
@@ -581,7 +581,7 @@ bool ctdb_sys_check_iface_exists(const char *iface)
int s;
struct ifreq ifr;
- s = socket(PF_PACKET, SOCK_RAW, 0);
+ s = socket(AF_PACKET, SOCK_RAW, 0);
if (s == -1){
/* We don't know if the interface exists, so assume yes */
DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n"));
diff --git a/ctdb/ctdb.pc.in b/ctdb/ctdb.pc.in
deleted file mode 100644
index 5f5bfab..0000000
--- a/ctdb/ctdb.pc.in
+++ /dev/null
@@ -1,19 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-datarootdir=@datarootdir@
-includedir=@includedir@
-libdir=@libdir@
-bindir=@bindir@
-sbindir=@sbindir@
-mandir=@mandir@
-localstatedir=@localstatedir@
-srcdir=@srcdir@
-etcdir=@sysconfdir@
-
-Name: ctdb
-Description: A clustered database to store temporary data
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir}
-Cflags: -I${includedir}
-URL: http://ctdb.samba.org/
-
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 55ce0e5..420ec52 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -217,7 +217,6 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man7/ctdb.7.gz
%{_mandir}/man7/ctdb-statistics.7.gz
%{_mandir}/man7/ctdb-tunables.7.gz
-%{_libdir}/pkgconfig/ctdb.pc
%package devel
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 61ab896..9061642 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -4365,7 +4365,7 @@ static int control_chktcpport(struct ctdb_context *ctdb,
int argc, const char **
port = atoi(argv[0]);
- s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (s == -1) {
printf("Failed to open local socket\n");
return errno;
@@ -4377,7 +4377,7 @@ static int control_chktcpport(struct ctdb_context *ctdb,
int argc, const char **
}
bzero(&sin, sizeof(sin));
- sin.sin_family = PF_INET;
+ sin.sin_family = AF_INET;
sin.sin_port = htons(port);
ret = bind(s, (struct sockaddr *)&sin, sizeof(sin));
close(s);
diff --git a/ctdb/utils/smnotify/smnotify.c b/ctdb/utils/smnotify/smnotify.c
index fa584ff..0cd61c7 100644
--- a/ctdb/utils/smnotify/smnotify.c
+++ b/ctdb/utils/smnotify/smnotify.c
@@ -43,14 +43,14 @@ static int create_socket(const char *addr, int port)
int s;
struct sockaddr_in sock_in;
- s = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (s == -1) {
printf("Failed to open local socket\n");
exit(10);
}
bzero(&sock_in, sizeof(sock_in));
- sock_in.sin_family = PF_INET;
+ sock_in.sin_family = AF_INET;
sock_in.sin_port = htons(port);
inet_aton(addr, &sock_in.sin_addr);
if (bind(s, (struct sockaddr *)&sock_in, sizeof(sock_in)) == -1) {
@@ -124,7 +124,7 @@ int main(int argc, const char *argv[])
/* Setup a sockaddr_in for the client we want to notify */
bzero(&sock_cl, sizeof(sock_cl));
- sock_cl.sin_family = PF_INET;
+ sock_cl.sin_family = AF_INET;
sock_cl.sin_port = htons(clientport);
inet_aton(client, &sock_cl.sin_addr);
diff --git a/ctdb/wscript b/ctdb/wscript
index edd4aa4..e1fad17 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -615,15 +615,6 @@ def build(bld):
bld.install_dir(bld.env.CTDB_RUNDIR)
bld.install_dir(bld.env.CTDB_VARDIR)
- sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION
- t = bld.SAMBA_GENERATOR('ctdb-pc',
- source='ctdb.pc.in',
- target='ctdb.pc',
- rule='sed -e "%s" ${SRC} > ${TGT}' % sed_expr,
- dep_vars=['VERSION'])
- t.env.VERSION = VERSION
- bld.INSTALL_FILES('${LIBDIR}/pkgconfig', 'ctdb.pc')
-
# Unit tests
ctdb_unit_tests = [
'db_hash_test',
diff --git a/docs-xml/manpages/smbget.1.xml b/docs-xml/manpages/smbget.1.xml
index 965e229..59e2ffe 100644
--- a/docs-xml/manpages/smbget.1.xml
+++ b/docs-xml/manpages/smbget.1.xml
@@ -22,8 +22,7 @@
<arg choice="opt">-a, --guest</arg>
<arg choice="opt">-r, --resume</arg>
<arg choice="opt">-R, --recursive</arg>
- <arg choice="opt">-u, --username=STRING</arg>
- <arg choice="opt">-p, --password=STRING</arg>
+ <arg choice="opt">-U, --username=STRING</arg>
<arg choice="opt">-w, --workgroup=STRING</arg>
<arg choice="opt">-n, --nonprompt</arg>
<arg choice="opt">-d, --debuglevel=INT</arg>
@@ -35,7 +34,7 @@
<arg choice="opt">-v, --verbose</arg>
<arg choice="opt">-b, --blocksize</arg>
<arg choice="opt">-O, --stdout</arg>
- <arg choice="opt">-U, --update</arg>
+ <arg choice="opt">-u, --update</arg>
<arg choice="opt">-?, --help</arg>
<arg choice="opt">--usage</arg>
<arg choice="req">smb://host/share/path/to/file</arg>
@@ -78,13 +77,8 @@
</varlistentry>
<varlistentry>
- <term>-u, --username=STRING</term>
- <listitem><para>Username to use</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-p, --password=STRING</term>
- <listitem><para>Password to use</para></listitem>
+ <term> -U,
--username=<replaceable>username[%password]</replaceable></term>
+ <listitem><para>Username (and password) to use</para></listitem>
</varlistentry>
<varlistentry>
@@ -153,7 +147,7 @@
</varlistentry>
<varlistentry>
- <term>-U, --update</term>
+ <term>-u, --update</term>
<listitem><para>Download only when remote file is newer than
local file or local file is missing.</para></listitem>
</varlistentry>
diff --git a/docs-xml/manpages/smbgetrc.5.xml b/docs-xml/manpages/smbgetrc.5.xml
index a1a9b57..f1bb8b5 100644
--- a/docs-xml/manpages/smbgetrc.5.xml
+++ b/docs-xml/manpages/smbgetrc.5.xml
@@ -53,15 +53,11 @@
<listitem><para>Whether directories should be
downloaded recursively</para></listitem>
</varlistentry>
- <varlistentry><term>username
<replaceable>name</replaceable></term>
- <listitem><para>Username to use when logging in to the
remote server. Use an empty string for anonymous access.
+ <varlistentry><term>user
<replaceable>name[%password]</replaceable></term>
+ <listitem><para>Username (and password) to use when
logging in to the remote server. Use an empty string for anonymous access.
</para></listitem>
</varlistentry>
- <varlistentry><term>password
<replaceable>pass</replaceable></term>
- <listitem><para>Password to use when logging
in.</para></listitem>
- </varlistentry>
-
<varlistentry><term>workgroup
<replaceable>wg</replaceable></term>
<listitem><para>Workgroup to use when logging
in</para></listitem>
</varlistentry>
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/python/samba/__init__.py b/python/samba/__init__.py
index b04e83c..7cfbc4c 100644
--
Samba Shared Repository
