[SCM] Samba Shared Repository - branch v4-11-stable updated
Karolin Seeger
kseeger at samba.org
Mon Dec 16 15:15:55 UTC 2019
The branch, v4-11-stable has been updated
via a3e0dc33741 VERSION: Disable GIT_SNAPSHOT for the 4.11.4 release.
via 36da9ac22d8 s3: smbd: Only set xconn->smb1.negprot.done = true after supported_protocols[protocol].proto_reply_fn() succeeds.
via cfa22afe0a7 python: tests. Add test for fuzzing smbd crash bug.
via 5f8fef17042 s3: smbd: Ensure we exit if supported_protocols[protocol].proto_reply_fn() fails.
via e76ceea1deb s3: smbd: Change (*proto_reply_fn()) to return an NTSTATUS.
via ce67f60822e s3: smbd: Change reply_smb20xx() to return NTSTATUS.
via cff1d4c3421 s3: smbd: Ensure we exit on smbd_smb2_process_negprot() fail.
via 0521333d477 s3: smbd: Allow smbd_smb2_process_negprot() to return NTSTATUS as it can fail.
via a7fa51a7a56 s3: smbd: SMB2 - Ensure we use the correct session_id if encrypting an interim response.
via b4fd49a46b2 VERSION: Bump version up to 4.11.4.
via e81ef10bbf5 Merge tag 'samba-4.11.3' into v4-11-test
via 91f39dbda15 smbd: Increase a debug level
via ec4381228f3 heimdal-build: avoid hard-coded /usr/include/heimdal in asn1_compile-generated code.
via c37b94fd0a7 ldb: Release ldb 2.0.8
via 1c8ac011360 autobuild: harden samba-xc test suite
via b7894c151ab wafsamba: pass environment to cross-execute tests
via 98dc227dce9 wafsamba: avoid pre-forking if cross-compilation is enabled
via e1a0813aa5c wafsamba: use test_args instead of exec_args to support cross-compilation
via b691110c267 waf: upgrade to 2.0.18
via 70c829304e0 ctdb-tcp: Close inflight connecting TCP sockets after fork
via 0b78c29a0fa ctdb-tcp: Drop tracking of file descriptor for incoming connections
via 77deaadca8e ctdb-tcp: Avoid orphaning the TCP incoming queue
via bc152b8473a ctdb-tcp: Check incoming queue to see if incoming connection is up
via 3e5b173ef44 gitlab-ci: Run samba-fileserver-heimdalkrb5
via 7d7e6326493 bootstrap: Add heimdal-multidev for Debian and Ubuntu
via af83d6adf94 autobuild: Add test for build with system heimdal library
via ce4ab72c01f krb5_plugin: Fix developer build with newer heimdal system library
via 060ff2dd504 krb5_plugin: Use C99 initializer
via 95f267704e7 selftest: system-heimdal: workaround upstream "host" canon bug
via 83299928bbf wscript: Fix build with system heimdal
via 9010e9f373e s3: libsmb: Ensure return from net_share_enum_rpc() sets cli->raw_status on error.
via 78ead63dbff s3: utils: smbtree. Ensure we don't call cli_RNetShareEnum() on an SMB1 connection.
via 4b249abae3b s3: libsmb: Ensure we don't call cli_RNetShareEnum() on an SMB1 connection.
via 5d8e92a5727 s3:printing: Fix %J substition
via 1f504300bf3 s3:printing: add a DEBUG statement
via cbd6426ad51 s3:lib: factor out talloc_sub_advanced() from talloc_sub_full()
via 90c90fc8a25 s3: rename talloc_sub_advanced() to talloc_sub_full()
via 58ea968c752 s3: remove unused function standard_sub_advanced()
via 69faa68148b s3: replace standard_sub_advanced with talloc_sub_advanced in one place
via b4e5ae5bcba s3:printing: fix a long line
via ce18ef9e545 lib/adouble: pass filesize to ad_unpack()
via c00a8959b6f lib/adouble: drop ad_data reallocate logic
via 1fa47717494 vfs_fruit: README.Coding fix: multi-line if expression
via d47b2cb8a22 vfs_fruit: fix a long line
via fb118393f39 torture: expand test "vfs.fruit.resource fork IO" to check size
via 8c5e4161fa4 s3:smbd: Fix sync dosmode fallback in async dosmode codepath
via eacdde195ac s3:smbd: Incomplete conversion of former parametric options
via 098ddd6fe4e s3: remove now unneeded call to cmdline_messaging_context()
via ac3cb59fd4f s3:dbwrap: initialize messaging before getting the ctdb connection
via b30b3073f9c libnet_join: add SPNs for additional-dns-hostnames entries
via 35da7673e88 docs-xml: add "additional dns hostnames" smb.conf option
via 526ad3a904a libnet_join_set_machine_spn: simplify adding uniq spn to array
via 3f9a9b95dd1 libnet_join_set_machine_spn: simplify memory handling
via 2e7683c937e libnet_join_set_machine_spn: improve style and make a bit room for indentation
via 0b3503a436a libnet_join: build dnsHostName from netbios name and lp_dnsdomain()
via 79c2fd908d4 s4:dirsync: fix interaction of dirsync and extended_dn controls
via b62705398d1 s4:tests/dirsync: add tests for dirsync with extended_dn
via 2958016c30a replace: Only link libnsl and libsocket if requrired
via 4aa37b8e722 s3: torture: Ensure SMB1 cli_qpathinfo2() doesn't return an inode number.
via 509f11547f3 s3: libsmb: Ensure SMB1 cli_qpathinfo2() doesn't return an inode number.
via e704eee3083 VERSION: Bump version up to 4.11.3.
via 685c2d56a25 Merge tag 'samba-4.11.2' into v4-11-test
via 7b8309398be VERSION: Bump version up to 4.11.2...
from 7fc8563c2f6 VERSION: Disable GIT_SNAPSHOT for the 4.11.3 release.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-11-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 5 +-
VERSION | 2 +-
WHATSNEW.txt | 85 ++++++++-
bootstrap/config.py | 1 +
bootstrap/generated-dists/debian7/bootstrap.sh | 1 +
bootstrap/generated-dists/debian7/packages.yml | 1 +
bootstrap/generated-dists/debian8/bootstrap.sh | 1 +
bootstrap/generated-dists/debian8/packages.yml | 1 +
bootstrap/generated-dists/debian9/bootstrap.sh | 1 +
bootstrap/generated-dists/debian9/packages.yml | 1 +
bootstrap/generated-dists/ubuntu1404/bootstrap.sh | 1 +
bootstrap/generated-dists/ubuntu1404/packages.yml | 1 +
bootstrap/generated-dists/ubuntu1604/bootstrap.sh | 1 +
bootstrap/generated-dists/ubuntu1604/packages.yml | 1 +
bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 1 +
bootstrap/generated-dists/ubuntu1804/packages.yml | 1 +
bootstrap/sha1sum.txt | 2 +-
buildtools/bin/waf | 2 +-
buildtools/wafsamba/samba_autoconf.py | 6 +-
buildtools/wafsamba/samba_cross.py | 7 +-
buildtools/wafsamba/wafsamba.py | 2 +-
ctdb/tcp/ctdb_tcp.h | 1 -
ctdb/tcp/tcp_connect.c | 11 +-
ctdb/tcp/tcp_init.c | 12 +-
ctdb/tcp/tcp_io.c | 2 -
.../smbdotconf/base/additionaldnshostnames.xml | 11 ++
docs-xml/smbdotconf/printing/lppausecommand.xml | 1 +
docs-xml/smbdotconf/printing/lpqcommand.xml | 1 +
docs-xml/smbdotconf/printing/lpresumecommand.xml | 1 +
docs-xml/smbdotconf/printing/lprmcommand.xml | 1 +
docs-xml/smbdotconf/printing/printcommand.xml | 1 +
docs-xml/smbdotconf/printing/queuepausecommand.xml | 1 +
.../smbdotconf/printing/queueresumecommand.xml | 1 +
lib/ldb/ABI/{ldb-2.0.5.sigs => ldb-2.0.8.sigs} | 0
...yldb-util-1.1.10.sigs => pyldb-util-2.0.8.sigs} | 0
lib/ldb/wscript | 2 +-
lib/replace/wscript | 36 +++-
nsswitch/krb5_plugin/winbind_krb5_locator.c | 12 +-
python/samba/tests/smbd_fuzztest.py | 77 ++++++++
script/autobuild.py | 22 +++
selftest/target/Samba.pm | 6 +
selftest/tests.py | 1 +
source3/include/proto.h | 8 +-
source3/lib/dbwrap/dbwrap_open.c | 8 +-
source3/lib/popt_common_cmdline.c | 7 -
source3/lib/substitute.c | 38 ++--
source3/libnet/libnet_join.c | 195 +++++++++++----------
source3/libsmb/clirap.c | 10 +-
source3/libsmb/libsmb_dir.c | 40 +++--
source3/locking/share_mode_lock.c | 4 +-
source3/modules/vfs_ceph.c | 2 +-
source3/modules/vfs_expand_msdfs.c | 2 +-
source3/modules/vfs_fruit.c | 57 +++---
source3/modules/vfs_full_audit.c | 2 +-
source3/modules/vfs_glusterfs.c | 2 +-
source3/modules/vfs_gpfs.c | 2 +-
source3/modules/vfs_recycle.c | 2 +-
source3/modules/vfs_virusfilter_utils.c | 2 +-
source3/printing/print_generic.c | 19 +-
source3/printing/printing.c | 29 +--
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 10 +-
source3/smbd/dosmode.c | 6 +-
source3/smbd/globals.h | 6 +-
source3/smbd/lanman.c | 4 +-
source3/smbd/negprot.c | 39 +++--
source3/smbd/process.c | 9 +-
source3/smbd/reply.c | 4 +-
source3/smbd/service.c | 10 +-
source3/smbd/smb2_negprot.c | 15 +-
source3/smbd/smb2_server.c | 17 +-
source3/smbd/trans2.c | 4 +-
source3/torture/torture.c | 49 +++++-
source3/utils/dbwrap_tool.c | 2 -
source3/utils/eventlogadm.c | 3 -
source3/utils/ntlm_auth.c | 2 -
source3/utils/pdbedit.c | 2 -
source3/utils/sharesec.c | 1 -
source3/utils/smbget.c | 2 -
source3/utils/smbpasswd.c | 2 -
source3/utils/smbtree.c | 5 +
source3/utils/testparm.c | 4 +-
source4/dsdb/samdb/ldb_modules/dirsync.c | 19 +-
source4/dsdb/tests/python/dirsync.py | 31 ++++
source4/heimdal_build/wscript_build | 2 +-
source4/torture/vfs/fruit.c | 29 +++
testprogs/blackbox/test_net_ads.sh | 17 +-
third_party/waf/waflib/Configure.py | 20 ++-
third_party/waf/waflib/Context.py | 6 +-
third_party/waf/waflib/Scripting.py | 7 +-
third_party/waf/waflib/TaskGen.py | 2 +-
third_party/waf/waflib/Tools/asm.py | 37 +++-
third_party/waf/waflib/Tools/c_aliases.py | 6 +-
third_party/waf/waflib/Tools/c_config.py | 9 +-
third_party/waf/waflib/Tools/c_tests.py | 3 +-
third_party/waf/waflib/Tools/gas.py | 1 +
third_party/waf/waflib/Tools/javaw.py | 2 +-
third_party/waf/waflib/Tools/nasm.py | 5 +
third_party/waf/waflib/Tools/python.py | 27 +--
third_party/waf/waflib/extras/doxygen.py | 11 +-
third_party/waf/waflib/extras/fast_partial.py | 28 ++-
third_party/waf/waflib/extras/genpybind.py | 194 ++++++++++++++++++++
third_party/waf/waflib/extras/local_rpath.py | 8 +-
third_party/waf/waflib/extras/objcopy.py | 9 +-
wscript_configure_system_heimdal | 3 +
104 files changed, 1081 insertions(+), 344 deletions(-)
create mode 100644 docs-xml/smbdotconf/base/additionaldnshostnames.xml
copy lib/ldb/ABI/{ldb-2.0.5.sigs => ldb-2.0.8.sigs} (100%)
copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util-2.0.8.sigs} (100%)
create mode 100644 python/samba/tests/smbd_fuzztest.py
create mode 100644 third_party/waf/waflib/extras/genpybind.py
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 313ae01fa69..67a86d2b0c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: 339a70ba1881feec94109c5c4eafacf4ff6c43bc
+ SAMBA_CI_CONTAINER_TAG: 970e3a86b8a9dc10a0a3ec716ab355eb9664dc38
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -176,6 +176,9 @@ samba-ad-dc-backup:
samba-fileserver:
extends: .private_template
+samba-ktest-heimdal:
+ extends: .private_template
+
samba-ad-dc-1:
extends: .private_template
diff --git a/VERSION b/VERSION
index ac97c314eff..b53fc3ab1db 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=4
SAMBA_VERSION_MINOR=11
-SAMBA_VERSION_RELEASE=3
+SAMBA_VERSION_RELEASE=4
########################################################
# If a official release has a serious bug #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 8bafa38b47c..830081446ab 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,3 +1,84 @@
+ ==============================
+ Release Notes for Samba 4.11.4
+ December 16, 2019
+ ==============================
+
+
+This is the latest stable release of the Samba 4.11 release series.
+
+
+Changes since 4.11.3:
+---------------------
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 14161: s3: libsmb: Ensure SMB1 cli_qpathinfo2() doesn't return an inode
+ number.
+ * BUG 14174: s3: utils: smbtree. Ensure we don't call cli_RNetShareEnum()
+ on an SMB1 connection.
+ * BUG 14176: NT_STATUS_ACCESS_DENIED becomes EINVAL when using SMB2 in
+ SMBC_opendir_ctx.
+ * BUG 14189: s3: smbd: SMB2 - Ensure we use the correct session_id if
+ encrypting an interim response.
+ * BUG 14205: Prevent smbd crash after invalid SMB1 negprot.
+
+o Ralph Boehme <slow at samba.org>
+ * BUG 13745: s3:printing: Fix %J substition.
+ * BUG 13925: s3: Remove now unneeded call to cmdline_messaging_context().
+ * BUG 14069: Incomplete conversion of former parametric options.
+ * BUG 14070: Fix sync dosmode fallback in async dosmode codepath.
+ * BUG 14171: vfs_fruit returns capped resource fork length.
+
+o Isaac Boukris <iboukris at gmail.com>
+ * BUG 14116: libnet_join: Add SPNs for additional-dns-hostnames entries.
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 14211: smbd: Increase a debug level.
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 14153: Prevent azure ad connect from reporting discovery errors:
+ reference-value-not-ldap-conformant.
+
+o Christof Schmitt <cs at samba.org>
+ * BUG 14179: krb5_plugin: Fix developer build with newer heimdal system
+ library.
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 14168: replace: Only link libnsl and libsocket if requrired.
+
+o Martin Schwenke <martin at meltin.net>
+ * BUG 14175: ctdb: Incoming queue can be orphaned causing communication
+ breakdown.
+
+o Uri Simchoni <uri at samba.org>
+ * BUG 13846: ldb: Release ldb 2.0.8. Cross-compile will not take
+ cross-answers or cross-execute.
+ * BUG 13856: heimdal-build: Avoid hard-coded /usr/include/heimdal in
+ asn1_compile-generated code.
+
+
+#######################################
+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.11.3
December 10, 2019
@@ -57,8 +138,8 @@ database (https://bugzilla.samba.org/).
======================================================================
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
==============================
Release Notes for Samba 4.11.2
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 9126961fc93..a83a3efb983 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -102,6 +102,7 @@ PKGS = [
('libunwind-dev', 'libunwind-devel'), # for back trace
('libglib2.0-dev', 'glib2-devel'),
('libicu-dev', 'libicu-devel'),
+ ('heimdal-multidev', ''),
# NAME1, NAME2
# for debian, locales provide locale support with language packs
diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index 4e126cf5e8e..fcba67cb16f 100755
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
git \
glusterfs-common \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 667825c283e..62fd54b1197 100644
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -19,6 +19,7 @@ packages:
- git
- glusterfs-common
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 4c8c65223f9..54e3f78db93 100755
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
git \
glusterfs-common \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index a2d4bdb0638..a65ca2f5d05 100644
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -19,6 +19,7 @@ packages:
- git
- glusterfs-common
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index fa7051a67e1..4bc421437e6 100755
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
git \
glusterfs-common \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 1e3bd0c380c..0021d64db62 100644
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -19,6 +19,7 @@ packages:
- git
- glusterfs-common
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 65625604f4b..34c7726e50c 100755
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -29,6 +29,7 @@ apt-get -y install \
gdb \
git \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index 8838828d7b8..5dd5d008c6e 100644
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -18,6 +18,7 @@ packages:
- gdb
- git
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index a47ef984cb5..8923e06d257 100755
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -29,6 +29,7 @@ apt-get -y install \
gdb \
git \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index 23939c38e80..d42971db3b5 100644
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -18,6 +18,7 @@ packages:
- gdb
- git
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 45212ccfb81..3ec8f714aa0 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
git \
glusterfs-common \
gzip \
+ heimdal-multidev \
hostname \
htop \
krb5-config \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index f2c981fba83..8778af2bafb 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -19,6 +19,7 @@ packages:
- git
- glusterfs-common
- gzip
+ - heimdal-multidev
- hostname
- htop
- krb5-config
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 52cf7350bc0..0a3dbf1adf0 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-339a70ba1881feec94109c5c4eafacf4ff6c43bc
+970e3a86b8a9dc10a0a3ec716ab355eb9664dc38
diff --git a/buildtools/bin/waf b/buildtools/bin/waf
index 8413f2332b7..11ce8e7480a 100755
--- a/buildtools/bin/waf
+++ b/buildtools/bin/waf
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
import os, sys, inspect
-VERSION="2.0.17"
+VERSION="2.0.18"
REVISION="x"
GIT="x"
INSTALL="x"
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 8e5dfb87102..62d3e20a15c 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -423,9 +423,9 @@ def CHECK_CODE(conf, code, define,
cflags.extend(ccflags)
if on_target:
- exec_args = conf.SAMBA_CROSS_ARGS(msg=msg)
+ test_args = conf.SAMBA_CROSS_ARGS(msg=msg)
else:
- exec_args = []
+ test_args = []
conf.COMPOUND_START(msg)
@@ -440,7 +440,7 @@ def CHECK_CODE(conf, code, define,
type=type,
msg=msg,
quote=quote,
- exec_args=exec_args,
+ test_args=test_args,
define_ret=define_ret)
except Exception:
if always:
diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
index 8863c2c53e7..0868a855a0d 100644
--- a/buildtools/wafsamba/samba_cross.py
+++ b/buildtools/wafsamba/samba_cross.py
@@ -120,7 +120,8 @@ class cross_Popen(Utils.subprocess.Popen):
if use_answers:
p = real_Popen(newargs,
stdout=Utils.subprocess.PIPE,
- stderr=Utils.subprocess.PIPE)
+ stderr=Utils.subprocess.PIPE,
+ env=kw.get('env', {}))
ce_out, ce_err = p.communicate()
ans = (p.returncode, samba_utils.get_string(ce_out))
add_answer(ca_file, msg, ans)
@@ -139,7 +140,7 @@ class cross_Popen(Utils.subprocess.Popen):
@conf
def SAMBA_CROSS_ARGS(conf, msg=None):
- '''get exec_args to pass when running cross compiled binaries'''
+ '''get test_args to pass when running cross compiled binaries'''
if not conf.env.CROSS_COMPILE:
return []
@@ -147,6 +148,8 @@ def SAMBA_CROSS_ARGS(conf, msg=None):
if real_Popen is None:
real_Popen = Utils.subprocess.Popen
Utils.subprocess.Popen = cross_Popen
+ Utils.run_process = Utils.run_regular_process
+ Utils.get_process = Utils.alloc_process_pool = Utils.nada
ret = []
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 76d65ebfcb6..205d5b4ac32 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -38,7 +38,7 @@ LIB_PATH="shared"
os.environ['PYTHONUNBUFFERED'] = '1'
-if Context.HEXVERSION not in (0x2001100,):
+if Context.HEXVERSION not in (0x2001200,):
Logs.error('''
Please use the version of waf that comes with Samba, not
a system installed version. See http://wiki.samba.org/index.php/Waf
diff --git a/ctdb/tcp/ctdb_tcp.h b/ctdb/tcp/ctdb_tcp.h
index 9a615fc6393..daabad74297 100644
--- a/ctdb/tcp/ctdb_tcp.h
+++ b/ctdb/tcp/ctdb_tcp.h
@@ -37,7 +37,6 @@ struct ctdb_tcp_node {
struct tevent_timer *connect_te;
struct ctdb_context *ctdb;
- int in_fd;
struct ctdb_queue *in_queue;
};
diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c
index 6123380ca9f..a75f35a809e 100644
--- a/ctdb/tcp/tcp_connect.c
+++ b/ctdb/tcp/tcp_connect.c
@@ -153,7 +153,7 @@ static void ctdb_node_connect_write(struct tevent_context *ev,
* as connected, but only if the corresponding listening
* socket is also connected
*/
- if (tnode->in_fd != -1) {
+ if (tnode->in_queue != NULL) {
node->ctdb->upcalls->node_connected(node);
}
}
@@ -312,6 +312,13 @@ static void ctdb_listen_event(struct tevent_context *ev, struct tevent_fd *fde,
return;
}
+ if (tnode->in_queue != NULL) {
+ DBG_ERR("Incoming queue active, rejecting connection from %s\n",
+ ctdb_addr_to_str(&addr));
+ close(fd);
+ return;
+ }
+
ret = set_blocking(fd, false);
if (ret != 0) {
DBG_ERR("Failed to set socket non-blocking (%s)\n",
@@ -348,8 +355,6 @@ static void ctdb_listen_event(struct tevent_context *ev, struct tevent_fd *fde,
return;
}
- tnode->in_fd = fd;
-
/*
* Mark the connecting node as connected, but only if the
* corresponding outbound connected is also up
diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c
index a9cb9b36a01..0eb9799ac4a 100644
--- a/ctdb/tcp/tcp_init.c
+++ b/ctdb/tcp/tcp_init.c
@@ -43,11 +43,6 @@ static int tnode_destructor(struct ctdb_tcp_node *tnode)
tnode->out_fd = -1;
}
- if (tnode->in_fd != -1) {
- close(tnode->in_fd);
- tnode->in_fd = -1;
- }
-
return 0;
}
@@ -61,7 +56,6 @@ static int ctdb_tcp_add_node(struct ctdb_node *node)
CTDB_NO_MEMORY(node->ctdb, tnode);
tnode->out_fd = -1;
- tnode->in_fd = -1;
tnode->ctdb = node->ctdb;
node->private_data = tnode;
@@ -143,8 +137,14 @@ static void ctdb_tcp_shutdown(struct ctdb_context *ctdb)
{
struct ctdb_tcp *ctcp = talloc_get_type(ctdb->private_data,
struct ctdb_tcp);
+ uint32_t i;
+
talloc_free(ctcp);
ctdb->private_data = NULL;
+
+ for (i=0; i<ctdb->num_nodes; i++) {
+ TALLOC_FREE(ctdb->nodes[i]->private_data);
+ }
}
/*
diff --git a/ctdb/tcp/tcp_io.c b/ctdb/tcp/tcp_io.c
index e8ebff887e1..2d8ec0f7062 100644
--- a/ctdb/tcp/tcp_io.c
+++ b/ctdb/tcp/tcp_io.c
@@ -76,8 +76,6 @@ void ctdb_tcp_read_cb(uint8_t *data, size_t cnt, void *args)
failed:
TALLOC_FREE(tnode->in_queue);
- close(tnode->in_fd);
- tnode->in_fd = -1;
node->ctdb->upcalls->node_dead(node);
TALLOC_FREE(data);
diff --git a/docs-xml/smbdotconf/base/additionaldnshostnames.xml b/docs-xml/smbdotconf/base/additionaldnshostnames.xml
new file mode 100644
index 00000000000..ddc04ee9f81
--- /dev/null
+++ b/docs-xml/smbdotconf/base/additionaldnshostnames.xml
@@ -0,0 +1,11 @@
+<samba:parameter name="additional dns hostnames"
+ context="G"
+ type="cmdlist"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+ <description>
+ <para> A list of additional DNS names by which this host can be identified
+ </para>
+</description>
+<value type="default"><comment>empty string (no additional dns names)</comment></value>
+<value type="example"> host2.example.com host3.other.com </value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/printing/lppausecommand.xml b/docs-xml/smbdotconf/printing/lppausecommand.xml
--
Samba Shared Repository
More information about the samba-cvs
mailing list