The branch, v4-12-stable has been updated
via e608cffa870 VERSION: Disable GIT_SNAPSHOT for the 4.12.10 release.
via 3f64827fdb9 WHATSNEW: Add release notes for Samba 4.12.10.
via 5d78ec76c86 s3: modules: vfs_glusterfs: Fix leak of char **lines
onto mem_ctx on return.
via 329c95136ff s3-vfs_glusterfs: refuse connection when write-behind
xlator is present
via 00040999380 docs-xml/manpages: Add warning about write-behind
translator for vfs_glusterfs
via 7e955ca5cf9 ctdb-common: Avoid aliasing errors during code
optimization
via e1f7e422bd5 vfs_zfsacl: only grant DELETE_CHILD if ACL tag is
special
via e14dfa439e7 vfs_zfsacl: use a helper variable in
zfs_get_nt_acl_common()
via b260c3003bb vfs_zfsacl: README.Coding fix
via 1bf997aa244 vfs_zfsacl: Add new parameter to stop automatic
addition of special entries
via 78d843f4362 vfs_zfsacl: use handle based facl() call to query ZFS
filesytem ACL
via fe842a5412a smb.conf.5: add clarification how configuration changes
reflected by Samba
via 2b4c9b9baca VERSION: Bump version up to 4.12.10.
via fe8d38f49e6 Merge tag 'samba-4.12.9' into v4-12-test
via ae4d3932cfb docs: fix default value of spoolss:architecture
via c3c95e07443 winexe: add configure option to control whether to
build it (default: auto)
via fd5ef942bad provision: BIND 9.17.x is not supported
via 8a7fc998f09 provision: Add support for BIND 9.16.x
via 7336a1c6755 bind9-dlz: Add support for BIND 9.16.x
via 4ab29fb056a provision: BIND 9.15.x is not supported
via 55d1f4e9f5e provision: Add support for BIND 9.14.x
via 5400b928d42 bind9-dlz: Add support for BIND 9.14.x
via 49eaec78a0b provision: BIND 9.13.x is not supported
via 4cbeb5ca3c3 bind9-dlz: Bind 9.13.x switched to using bool as
isc_boolean_t instead of int.
via d5933bfdee2 nsswitch/nsstest.c: Avoid nss function conflicts with
glibc nss.h
via a127fb862b6 s4:dsdb:acl_read: Implement "List Object" mode feature
via 66e64bf9a61 s4:dsdb:util: add dsdb_do_list_object() helper
via 6073edb8c08 s4:dsdb:acl_read: defer LDB_ERR_NO_SUCH_OBJECT
via 376fd7e1c0f s4:dsdb:acl_read: make use of
aclread_check_object_visible() for the search base
via f6af56ad68a s4:dsdb:acl_read: fully set up 'struct aclread_context'
before the search base acl check
via c1df795199c s4:dsdb:acl_read: introduce
aclread_check_object_visible() helper
via 1da871f7f24 s4:dsdb:tests: add AclVisibiltyTests
via 62f7642b073 python/tests: add DynamicTestCase
setUpDynamicTestCases() infrastructure
via 3a1d5236678 ctdb-tests: Strengthen node state checking in ctdb
disable/enable test
via 3a4def14560 ctdb-recoverd: Drop unnecessary and broken code
via 91a8a9a9850 ctdb-recoverd: Drop unnecessary code
via f4ce7990607 VERSION: Bump version up to 4.12.9...
from 43c7685056d VERSION: Disable GIT_SNAPSHOT for Samba 4.12.9.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-12-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 99 ++++++-
ctdb/common/system_socket.c | 31 +-
ctdb/server/ctdb_recoverd.c | 61 ----
.../failover/pubips.030.disable_enable.sh | 4 +-
docs-xml/manpages/nmbd.8.xml | 10 +-
docs-xml/manpages/smb.conf.5.xml | 30 ++
docs-xml/manpages/smbd.8.xml | 13 +-
docs-xml/manpages/vfs_glusterfs.8.xml | 22 ++
docs-xml/manpages/vfs_zfsacl.8.xml | 20 ++
docs-xml/manpages/winbindd.8.xml | 7 +-
.../smbdotconf/printing/spoolssarchitecture.xml | 4 +-
examples/winexe/wscript_build | 3 +-
nsswitch/nsstest.c | 16 +-
python/samba/provision/sambadns.py | 17 +-
python/samba/tests/__init__.py | 27 ++
source3/modules/vfs_glusterfs.c | 91 ++++++
source3/modules/vfs_zfsacl.c | 203 ++++++++++---
source3/wscript | 17 ++
source4/dns_server/dlz_minimal.h | 24 +-
source4/dns_server/wscript_build | 20 ++
source4/dsdb/samdb/ldb_modules/acl_read.c | 185 +++++++++---
source4/dsdb/samdb/ldb_modules/util.c | 21 ++
source4/dsdb/tests/python/acl.py | 321 ++++++++++++++++++++-
source4/selftest/tests.py | 2 +-
source4/setup/named.conf.dlz | 6 +
26 files changed, 1076 insertions(+), 180 deletions(-)
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index e82315c39a6..f1cc579dbc0 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=4
SAMBA_VERSION_MINOR=12
-SAMBA_VERSION_RELEASE=9
+SAMBA_VERSION_RELEASE=10
########################################################
# If a official release has a serious bug #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 674d250c71a..69007c592f5 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,3 +1,98 @@
+ ===============================
+ Release Notes for Samba 4.12.10
+ November 05, 2020
+ ===============================
+
+
+This is the latest stable release of the Samba 4.12 release series.
+
+Major enhancements include:
+
+ o BUG 14537: ctdb-common: Avoid aliasing errors during code optimization.
+ o BUG 14486: vfs_glusterfs: Avoid data corruption with the write-behind
+ translator.
+
+
+=======
+Details
+=======
+
+The GlusterFS write-behind performance translator, when used with Samba, could
+be a source of data corruption. The translator, while processing a write call,
+immediately returns success but continues writing the data to the server in the
+background. This can cause data corruption when two clients relying on Samba to
+provide data consistency are operating on the same file.
+
+The write-behind translator is enabled by default on GlusterFS.
+The vfs_glusterfs plugin will check for the presence of the translator and
+refuse to connect if detected. Please disable the write-behind translator for
+the GlusterFS volume to allow the plugin to connect to the volume.
+
+
+Changes since 4.12.9
+--------------------
+
+o Jeremy Allison <[email protected]>
+ * BUG 14486: s3: modules: vfs_glusterfs: Fix leak of char
+ **lines onto mem_ctx on return.
+
+o Ralph Boehme <[email protected]>
+ * BUG 14471: RN: vfs_zfsacl: Only grant DELETE_CHILD if ACL tag is special.
+
+o Alexander Bokovoy <[email protected]>
+ * BUG 14538: smb.conf.5: Add clarification how configuration changes
+ reflected by Samba.
+
+o Günther Deschner <[email protected]>
+ * BUG 14486: s3-vfs_glusterfs: Refuse connection when write-behind xlator is
+ present.
+ * winexe:: Add configure option to control whether to build it
+ (default: auto).
+
+o Amitay Isaacs <[email protected]>
+ * BUG 14487: Latest version of Bind9 is now 9.20.
+ * BUG 14537: ctdb-common: Avoid aliasing errors during code optimization.
+
+o Stefan Metzmacher <[email protected]>
+ * BUG 14531: s4:dsdb:acl_read: Implement "List Object" mode feature.
+
+o Sachin Prabhu <[email protected]>
+ * BUG 14486: docs-xml/manpages: Add warning about write-behind translator
for
+ vfs_glusterfs.
+
+o Khem Raj <[email protected]>
+ * nsswitch/nsstest.c: Avoid nss function conflicts with glibc nss.h.
+
+o Martin Schwenke <[email protected]>
+ * BUG 14513: ctdb disable/enable can still fail due to race condition.
+
+o Andrew Walker <[email protected]>
+ * BUG 14471: RN: vfs_zfsacl: Only grant DELETE_CHILD if ACL tag is special.
+
+
+#######################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the Samba 4.1 and newer product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+----------------------------------------
+
==============================
Release Notes for Samba 4.12.9
October 29, 2020
@@ -88,8 +183,8 @@ database (https://bugzilla.samba.org/).
======================================================================
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
==============================
Release Notes for Samba 4.12.8
diff --git a/ctdb/common/system_socket.c b/ctdb/common/system_socket.c
index af297f8608b..bb513508353 100644
--- a/ctdb/common/system_socket.c
+++ b/ctdb/common/system_socket.c
@@ -67,16 +67,19 @@
/*
uint16 checksum for n bytes
*/
-static uint32_t uint16_checksum(uint16_t *data, size_t n)
+static uint32_t uint16_checksum(uint8_t *data, size_t n)
{
uint32_t sum=0;
+ uint16_t value;
+
while (n>=2) {
- sum += (uint32_t)ntohs(*data);
- data++;
+ memcpy(&value, data, 2);
+ sum += (uint32_t)ntohs(value);
+ data += 2;
n -= 2;
}
if (n == 1) {
- sum += (uint32_t)ntohs(*(uint8_t *)data);
+ sum += (uint32_t)ntohs(*data);
}
return sum;
}
@@ -117,13 +120,13 @@ bool ctdb_sys_have_ip(ctdb_sock_addr *_addr)
/*
* simple TCP checksum - assumes data is multiple of 2 bytes long
*/
-static uint16_t ip_checksum(uint16_t *data, size_t n, struct ip *ip)
+static uint16_t ip_checksum(uint8_t *data, size_t n, struct ip *ip)
{
uint32_t sum = uint16_checksum(data, n);
uint16_t sum2;
- sum += uint16_checksum((uint16_t *)&ip->ip_src, sizeof(ip->ip_src));
- sum += uint16_checksum((uint16_t *)&ip->ip_dst, sizeof(ip->ip_dst));
+ sum += uint16_checksum((uint8_t *)&ip->ip_src, sizeof(ip->ip_src));
+ sum += uint16_checksum((uint8_t *)&ip->ip_dst, sizeof(ip->ip_dst));
sum += ip->ip_p + n;
sum = (sum & 0xFFFF) + (sum >> 16);
sum = (sum & 0xFFFF) + (sum >> 16);
@@ -135,22 +138,22 @@ static uint16_t ip_checksum(uint16_t *data, size_t n,
struct ip *ip)
return sum2;
}
-static uint16_t ip6_checksum(uint16_t *data, size_t n, struct ip6_hdr *ip6)
+static uint16_t ip6_checksum(uint8_t *data, size_t n, struct ip6_hdr *ip6)
{
uint16_t phdr[3];
uint32_t sum = 0;
uint16_t sum2;
uint32_t len;
- sum += uint16_checksum((uint16_t *)(void *)&ip6->ip6_src, 16);
- sum += uint16_checksum((uint16_t *)(void *)&ip6->ip6_dst, 16);
+ sum += uint16_checksum((uint8_t *)&ip6->ip6_src, 16);
+ sum += uint16_checksum((uint8_t *)&ip6->ip6_dst, 16);
len = htonl(n);
phdr[0] = len & UINT16_MAX;
phdr[1] = (len >> 16) & UINT16_MAX;
/* ip6_nxt is only 8 bits, so fits comfortably into a uint16_t */
phdr[2] = htons(ip6->ip6_nxt);
- sum += uint16_checksum(phdr, sizeof(phdr));
+ sum += uint16_checksum((uint8_t *)phdr, sizeof(phdr));
sum += uint16_checksum(data, n);
@@ -316,7 +319,7 @@ static int ip6_na_build(uint8_t *buffer,
sizeof(struct nd_opt_hdr));
memcpy(ea, hwaddr, ETH_ALEN);
- nd_na->nd_na_cksum = ip6_checksum((uint16_t *)nd_na,
+ nd_na->nd_na_cksum = ip6_checksum((uint8_t *)nd_na,
ntohs(ip6->ip6_plen),
ip6);
@@ -556,7 +559,7 @@ static int tcp4_build(uint8_t *buf,
ip4pkt->tcp.th_off = sizeof(ip4pkt->tcp)/sizeof(uint32_t);
/* this makes it easier to spot in a sniffer */
ip4pkt->tcp.th_win = htons(1234);
- ip4pkt->tcp.th_sum = ip_checksum((uint16_t *)&ip4pkt->tcp,
+ ip4pkt->tcp.th_sum = ip_checksum((uint8_t *)&ip4pkt->tcp,
sizeof(ip4pkt->tcp),
&ip4pkt->ip);
@@ -609,7 +612,7 @@ static int tcp6_build(uint8_t *buf,
ip6pkt->tcp.th_off = sizeof(ip6pkt->tcp)/sizeof(uint32_t);
/* this makes it easier to spot in a sniffer */
ip6pkt->tcp.th_win = htons(1234);
- ip6pkt->tcp.th_sum = ip6_checksum((uint16_t *)&ip6pkt->tcp,
+ ip6pkt->tcp.th_sum = ip6_checksum((uint8_t *)&ip6pkt->tcp,
sizeof(ip6pkt->tcp),
&ip6pkt->ip6);
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index f825427e7a3..856fcbb72c8 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -2667,67 +2667,6 @@ static void main_loop(struct ctdb_context *ctdb, struct
ctdb_recoverd *rec,
}
}
- /*
- * Update node flags obtained from each active node. This ensure we have
- * up-to-date information for all the nodes.
- */
- for (j=0; j<nodemap->num; j++) {
- if (nodemap->nodes[j].pnn == ctdb->pnn) {
- continue;
- }
- if (nodemap->nodes[j].flags & NODE_FLAGS_INACTIVE) {
- continue;
- }
- nodemap->nodes[j].flags = remote_nodemaps[j]->nodes[j].flags;
- }
-
- for (j=0; j<nodemap->num; j++) {
- if (nodemap->nodes[j].pnn == ctdb->pnn) {
- continue;
- }
- if (nodemap->nodes[j].flags & NODE_FLAGS_INACTIVE) {
- continue;
- }
-
- /* verify the flags are consistent
- */
- for (i=0; i<nodemap->num; i++) {
- if (nodemap->nodes[i].flags & NODE_FLAGS_DISCONNECTED) {
- continue;
- }
-
- if (nodemap->nodes[i].flags !=
remote_nodemaps[j]->nodes[i].flags) {
- DEBUG(DEBUG_ERR, (__location__ " Remote node:%u
has different flags for node %u. It has 0x%02x vs our 0x%02x\n",
- nodemap->nodes[j].pnn,
- nodemap->nodes[i].pnn,
- remote_nodemaps[j]->nodes[i].flags,
- nodemap->nodes[i].flags));
- if (i == j) {
- DEBUG(DEBUG_ERR,("Use flags 0x%02x from
remote node %d for cluster update of its own flags\n",
remote_nodemaps[j]->nodes[i].flags, j));
- update_flags_on_all_nodes(
- rec,
- nodemap->nodes[i].pnn,
- remote_nodemaps[j]->nodes[i].flags);
- ctdb_set_culprit(rec,
nodemap->nodes[j].pnn);
- do_recovery(rec, mem_ctx, pnn, nodemap,
- vnnmap);
- return;
- } else {
- DEBUG(DEBUG_ERR,("Use flags 0x%02x from
local recmaster node for cluster update of node %d flags\n",
nodemap->nodes[i].flags, i));
- update_flags_on_all_nodes(
- rec,
- nodemap->nodes[i].pnn,
- nodemap->nodes[i].flags);
- ctdb_set_culprit(rec,
nodemap->nodes[j].pnn);
- do_recovery(rec, mem_ctx, pnn, nodemap,
- vnnmap);
- return;
- }
- }
- }
- }
-
-
/* count how many active nodes there are */
num_lmasters = 0;
for (i=0; i<nodemap->num; i++) {
diff --git a/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh
b/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh
index c0bb62d1991..0b8425b2556 100755
--- a/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh
+++ b/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh
@@ -21,10 +21,10 @@ select_test_node_and_ips
echo "Disabling node $test_node"
try_command_on_node 1 $CTDB disable -n $test_node
-wait_until_node_has_status $test_node disabled
+wait_until_node_has_status $test_node disabled 30 all
wait_until_node_has_no_ips "$test_node"
echo "Re-enabling node $test_node"
try_command_on_node 1 $CTDB enable -n $test_node
-wait_until_node_has_status $test_node enabled
+wait_until_node_has_status $test_node enabled 30 all
wait_until_node_has_some_ips "$test_node"
diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml
index c145e820770..4ece42f3ca6 100644
--- a/docs-xml/manpages/nmbd.8.xml
+++ b/docs-xml/manpages/nmbd.8.xml
@@ -244,7 +244,15 @@
directory (or the <filename>var/locks</filename> directory configured
under wherever Samba was configured to install itself). This will also
cause <command>nmbd</command> to dump out its server database in
- the <filename>log.nmb</filename> file.</para>
+ the <filename>log.nmb</filename> file. Additionally, the signal will
+ cause reloading <command>nmbd</command> configuration.</para>
+
+ <para>
+ Instead of sending a SIGHUP signal, a request to dump namelists
+ into the file and reload a configuration file may be sent using
+ <citerefentry><refentrytitle>smbcontrol</refentrytitle>
+ <manvolnum>1</manvolnum></citerefentry> program.
+ </para>
<para>The debug log level of nmbd may be raised or lowered
using <citerefentry><refentrytitle>smbcontrol</refentrytitle>
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index f72833c003f..c4387187ecc 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -27,6 +27,36 @@
</para>
</refsect1>
+<refsect1>
+ <title>HOW CONFIGURATION CHANGES ARE APPLIED</title>
+
+ <para>
+ The Samba suite includes a number of different programs. Some of them
operate in a client mode, others are
+ server daemons that provide various services to its clients. The
<filename moreinfo="none">smb.conf
+ </filename> file is processed in the following way:
+ </para>
+
+ <itemizedlist>
+ <listitem><para>
+ The Samba suite's client applications read their configuration
only once. Any changes made after start aren't
+ reflected in the context of already running client code.
+ </para></listitem>
+
+ <listitem><para>
+ The Samba suite's server daemons reload their configuration
when requested. However, already active connections
+ do not change their configuration. More detailed information
can be found in
+
<citerefentry><refentrytitle>smbd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
and <citerefentry>
+
<refentrytitle>winbindd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
manual pages.
+ </para></listitem>
+ </itemizedlist>
+
+ <para>
+ To request Samba server daemons to refresh their configuration, please
use
+
<citerefentry><refentrytitle>smbcontrol</refentrytitle><manvolnum>1</manvolnum></citerefentry>
utility.
+ </para>
+
+</refsect1>
+
<refsect1 id="FILEFORMATSECT">
<title>FILE FORMAT</title>
diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml
index deba2cad9e2..73d808c70b7 100644
--- a/docs-xml/manpages/smbd.8.xml
+++ b/docs-xml/manpages/smbd.8.xml
@@ -68,11 +68,18 @@
the copy of the server for that client terminates.</para>
<para>The configuration file, and any files that it includes,
- are automatically reloaded every minute, if they change. You
- can force a reload by sending a SIGHUP to the server. Reloading
+ are automatically reloaded every three minutes, if they change.
+ One can force a reload by sending a SIGHUP to the server. Reloading
the configuration file will not affect connections to any service
that is already established. Either the user will have to
- disconnect from the service, or <command>smbd</command> killed and
restarted.</para>
+ disconnect from the service, or <command>smbd</command> killed and
restarted.
+ </para>
+
+ <para>Instead of sending a SIGHUP signal, a request to reload
configuration
+ file may be sent using
<citerefentry><refentrytitle>smbcontrol</refentrytitle>
+ <manvolnum>1</manvolnum></citerefentry> program.
+ </para>
+
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml
b/docs-xml/manpages/vfs_glusterfs.8.xml
index cf3b8e5e384..7a4da1af919 100644
--- a/docs-xml/manpages/vfs_glusterfs.8.xml
+++ b/docs-xml/manpages/vfs_glusterfs.8.xml
@@ -161,6 +161,28 @@
</refsect1>
+<refsect1>
+ <title>CAVEATS</title>
+
+ <para>
+ The GlusterFS write-behind performance translator, when used
+ with Samba, could be a source of data corruption. The
+ translator, while processing a write call, immediately returns
+ success but continues writing the data to the server in the
+ background. This can cause data corruption when two clients
+ relying on Samba to provide data consistency are operating on
+ the same file.
+ </para>
+ <para>
+ The write-behind translator is enabled by default on GlusterFS.
+ The vfs_glusterfs plugin will check for the presence of the
+ translator and refuse to connect if detected.
+ Please disable the write-behind translator for the GlusterFS
+ volume to allow the plugin to connect to the volume.
+ </para>
+</refsect1>
+
+
<refsect1>
<title>VERSION</title>
diff --git a/docs-xml/manpages/vfs_zfsacl.8.xml
b/docs-xml/manpages/vfs_zfsacl.8.xml
index ae583409fe1..1ac954b9429 100644
--- a/docs-xml/manpages/vfs_zfsacl.8.xml
+++ b/docs-xml/manpages/vfs_zfsacl.8.xml
@@ -140,6 +140,26 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>zfsacl:block_special = [yes|no]</term>
+ <listitem>
+ <para>Prevent ZFS from automatically adding NFSv4 special
+ entries (owner@, group@, everyone@). ZFS will automatically
+ generate these these entries when calculating the inherited ACL
+ of new files if the ACL of the parent directory lacks an
+ inheriting special entry. This may result in user confusion and
+ unexpected change in permissions of files and directories as the
+ inherited ACL is generated. Blocking this behavior is achieved
+ by setting an inheriting everyone@ that grants no permissions
+ and not adding the entry to the file's Security
+ Descriptor</para>
+ <itemizedlist>
+ <listitem><para><command>yes
(default)</command></para></listitem>
+ <listitem><para><command>no</command></para></listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term>zfsacl:map_dacl_protected = [yes|no]</term>
<listitem>
diff --git a/docs-xml/manpages/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml
index 71fb248c204..99c00388c20 100644
--- a/docs-xml/manpages/winbindd.8.xml
+++ b/docs-xml/manpages/winbindd.8.xml
@@ -390,7 +390,12 @@ auth required /lib/security/pam_unix.so \
apply any parameter changes to the running
version of winbindd. This signal also clears any cached
user and group information. The list of other domains trusted
- by winbindd is also reloaded. </para></listitem>
+ by winbindd is also reloaded.
+ </para>
+ <para>Instead of sending a SIGHUP signal, a request to reload
configuration
+ file may be sent using
<citerefentry><refentrytitle>smbcontrol</refentrytitle>
+ <manvolnum>1</manvolnum></citerefentry> program.
+ </para></listitem>
</varlistentry>
<varlistentry>
diff --git a/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
b/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
index 1eccf9f58cf..dae73905663 100644
--- a/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
+++ b/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
@@ -8,6 +8,6 @@
architecture. Samba's spoolss print server architecture can be changed
using
this parameter.</para>
</description>
-<value type="default">Windows NT x86</value>
-<value type="example">Windows x64</value>
+<value type="default">Windows x64</value>
+<value type="example">Windows NT x86</value>
</samba:parameter>
diff --git a/examples/winexe/wscript_build b/examples/winexe/wscript_build
index 43c09717e3d..559ed3fc706 100644
--
Samba Shared Repository
