[SCM] Samba Shared Repository - branch v4-5-test updated
Stefan Metzmacher
metze at samba.org
Wed Aug 10 13:09:07 UTC 2016
The branch, v4-5-test has been updated
via 6a9bdca dbwrap_ctdb: treat empty records in ltdb as non-existing
via aa0522e s4/torture: add a test for ctdb-tombstrone-record deadlock
via 449a0cf smbd: ignore ctdb tombstone records in fetch_share_mode_unlocked_parser()
via fa0ffa2 dbwrap: Fix structure initialization
via 3688305 buildscripts: Fix the regression with --without-acl-support.
via a990608 source3/wscript: Add support for disabling vfs_cephfs
via 5bcfc32 ctdb-daemon: Clean up SET_DB_PRIORITY/GET_DB_PRIORITY deprecation
via ae5f9b0 ctdb-packaging: Stop RPM from renaming working config to ctdb.rpmsave
via be449db ctdb-doc: Document that "ctdb tickle" can now read from stdin
via 52bff15 ctdb-tools: "ctdb tickle" command should run without daemon
via a009532 ctdb-tools: Cancel transaction on error or if commit fails
via 34c3499 ctdb-client: transaction_cancel must free transaction handle
via 533d7e1 ctdb-tools: Free temporary memory context before exiting
via 661f901 ctdb-tools: Close tdb database on error
via cab7216 ctdb-tools: Free connection list after processing it
via aa3e881 ctdb-tools: Add early return for empty connection list
via 08d6c26 ctdb-tools: Free tickle list before exiting
via e7c2383 ctdb-tools: Free record if it does not contain valid data
via c1dfac0 ctdb-tools: Fix CID 1364706 - resource leak
via 66bf88a ctdb-tools: Fix CID 1364705 - resource leak
via 15c6776 ctdb-tools: Fix CID 1364704 - resource leak
via 5e6bcb9 ctdb-tools: Fix CID 1364703 - resource leak
via dcae848 ctdb-tools: Fix CID 1364702 - resource leak
via a6b4f12 ctdb-tools: Fix CID 1364701 - resource leak
via f0fe4f1 ctdb-tools: Fix CID 1364699 - dereference after null check
via fe1ca7a ctdb-mutex: Avoid corner case where helper is already reparented to init
via 00d2d4b ctdb-daemon: Fix CID 1125627 Resource leak (RESOURCE_LEAK)
via fb3314f ctdb-common: Fix CID 1125585 Dereference after null check (FORWARD_NULL)
via 6e8863b ctdb-common: Fix CID 1125583 Dereference after null check (FORWARD_NULL)
via 9f0b1e1 ctdb-common: Fix CID 1125581 Dereference after null check (FORWARD_NULL)
via 29c0b81 ctdb-tests: Fix CID 1361816 Buffer not null terminated (BUFFER_SIZE_WARNING)
via f002457 ctdb-common: Fix CID 1363227 Resource leak (RESOURCE_LEAK)
via 2ffc301 ctdb-mutex: Fix CID 1359217 Resource leak (RESOURCE_LEAK)
via 96395c2 ctdb-daemon: Fix CID 1363067 Resource leak (RESOURCE_LEAK)
via 5d77e76 ctdb-daemon: Fix CID 1363233 Resource leak (RESOURCE_LEAK)
via a614e60 ctdb-utils: Fix CID 1297451 Explicit null dereferenced (FORWARD_NULL)
via 2c8c82d ctdb-common: Consistently use strlcpy() on interface names
via 13301d8 ctdb-common: Fix CID 1125553 Buffer not null terminated (BUFFER_SIZE_WARNING)
via 38d8bcf ctdb-tests: Add explicit wait to the fork_helper()
via 35f777c ctdb-tests: Clean up and rename simple transaction_loop recovery test
via ea6a976 ctdb-tests: Clean up and rename simple transaction_loop test
via 106e572 ctdb-tests: Implement --interactive/-i option in transaction_loop
via 21cbbb1 ctdb-tests: Clean up and rename simple fetch_ring test
via 10e66ef ctdb-tests: Implement --interactive/-i option in fetch ring
via 8817849 ctdb-tests: Clean up and rename simple message_ring test
via 0686be6 ctdb-tests: Implement --interactive/-i option in message_ring
via c026a38 ctdb-tests: Add --interactive/-i option to test options parsing code
via a772738 ctdb-tests: Stop cross-talk between reclock tests
via 70a1836 ctdb-packaging: Move ctdb tests to libexec directory
via ca1ef4d ctdb-waf: Move ctdb tests to libexec directory
via 0791bd6 man: Wrong option for parameter ldap ssl in smb.conf man page
via 3cf958d async_req: make async_connect_send() "reentrant"
via d4e5992 docs: Bump version up to 4.5.
via de3d1f3 WHATSNEW: Start release notes for Samba 4.5.0rc2.
from de4eaf9 VERSION: Bump version up to 4.5.0rc2...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-5-test
- Log -----------------------------------------------------------------
commit 6a9bdca12845b4b666490c3b94f54d562e89714d
Author: Ralph Boehme <slow at samba.org>
Date: Mon Aug 8 16:58:51 2016 +0200
dbwrap_ctdb: treat empty records in ltdb as non-existing
When fetching records from remote ctdb nodes via ctdbd_parse() or in
db_ctdb_traverse(), we already check for tombstone records and skip
them. This was originally also done for the ltdb checks.
See also bug: https://bugzilla.samba.org/show_bug.cgi?id=10008
(commit 1cae59ce112ccb51b45357a52b902f80fce1eef1).
Commit 925625b52886d40b50fc631bad8bdc81970f7598 reverted part of the
patch of bug 10008 due to a deadlock it introduced.
This patch re-introduces the consistent treatment of empty records in
the ltdb but avoids the deadlock by correctly signalling
NT_STATUS_NOT_FOUND if an empty record is found authoritatively in
the ltdb and not calling ctdb in this case.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12005
Pair-Programmed-With: Michael Adam <obnox at samba.org>
Signed-off-by: Ralph Boehme <slow at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Tue Aug 9 04:38:44 CEST 2016 on sn-devel-144
(cherry picked from commit 25df582739918b7afd4e5497eaffe279e2d92cd1)
Autobuild-User(v4-5-test): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(v4-5-test): Wed Aug 10 15:08:00 CEST 2016 on sn-devel-144
commit aa0522e00084c5b023e78dc24cad86f76a0f41a5
Author: Ralph Boehme <slow at samba.org>
Date: Sat Jul 23 11:08:13 2016 +0200
s4/torture: add a test for ctdb-tombstrone-record deadlock
This tests for a possible deadlock between smbd and ctdb dealing with
ctdb tombstone records.
Commit 925625b52886d40b50fc631bad8bdc81970f7598 explains the deadlock in
more details and contains the fix. It's a fix for a regression
introduced by the patch for bug 10008 (1cae59ce112c).
If you ever want to use this test against that specific commit:
$ git checkout 925625b52886d40b50fc631bad8bdc81970f7598
$ git cherry-pick THIS_COMMIT
This should not deadlock on a ctdb cluster.
$ git revert 925625b52886d40b50fc631bad8bdc81970f7598
This will deadlock.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12005
Pair-Programmed-With: Michael Adam <obnox at samba.org>
Signed-off-by: Ralph Boehme <slow at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit b17e2f5c740fb081c007ed2e1c23138ffcba1469)
commit 449a0cfbc9ebfe779ac7431b369627f16092e76e
Author: Ralph Boehme <slow at samba.org>
Date: Wed Jul 20 12:36:24 2016 +0200
smbd: ignore ctdb tombstone records in fetch_share_mode_unlocked_parser()
dbwrap_parse_record() can return ctdb tombstone records from the lctdb,
ignore them.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12005
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 7147859c7afc1344e76485e2cbc286679110d96e)
commit fa0ffa25621d233bdfc7585ad6d70d08f89031cd
Author: Amitay Isaacs <amitay at gmail.com>
Date: Sun Aug 7 17:56:51 2016 +1000
dbwrap: Fix structure initialization
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12134
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Tue Aug 9 15:15:43 CEST 2016 on sn-devel-144
(cherry picked from commit afa41f023b4c3af067e401e53d2e89a8d568814a)
commit 3688305421febfe7cdd7c5723d8d333e7f91a926
Author: Ira Cooper <ira at samba.org>
Date: Tue Jul 26 11:44:47 2016 -0400
buildscripts: Fix the regression with --without-acl-support.
This will disable the vfs_glusterfs and vfs_cephfs modules if
you provide --without-acl-support.
In addition it makes compiling in POSIXACL_XATTR conditional
on vfs_glusterfs or vfs_cephfs being built in.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Steve French <sfrench at samba.org>
Tested-by: Steve French <sfrench at samba.org>
Autobuild-User(master): Ira Cooper <ira at samba.org>
Autobuild-Date(master): Mon Aug 8 21:27:46 CEST 2016 on sn-devel-144
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12133
(cherry picked from commit 14f29c4f560f1b3942245a6fa43924a8ce45d99d)
commit a99060836d5687d6b3060f0d00f86d2c53331e60
Author: Ira Cooper <ira at samba.org>
Date: Tue Jul 26 11:22:43 2016 -0400
source3/wscript: Add support for disabling vfs_cephfs
--enable-cephfs and --disable-cephfs both work now.
--enable-cephfs is the default to match previous
versions of Samba.
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Steve French <sfrench at samba.org>
Tested-by: Steve French <sfrench at samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12133
(cherry picked from commit 38bb993657f8eb6c49899de0d741ed5186ca5022)
commit 5bcfc32fcc2f33517b03797ad51c4b5be32b57be
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Jul 28 12:02:25 2016 +1000
ctdb-daemon: Clean up SET_DB_PRIORITY/GET_DB_PRIORITY deprecation
The current message is broken:
Control SET_DB_PRIORITY is not implemented any more, use instead
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12126
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit d7ecc913bb40783c8cf8c66e3c3e99e6df414381)
commit ae5f9b04e85af45866975f0355f1c0a43513f9e8
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Aug 3 06:51:57 2016 +1000
ctdb-packaging: Stop RPM from renaming working config to ctdb.rpmsave
The change to ctdbd.conf and removal of /etc/sysconfig/ctdb as a
configuration file makes RPM rename the latter with a .rpmsave suffix.
This means that a working configuration is moved aside on upgrade and
manual intervention is needed.
Avoid this by convincing RPM that the existing /etc/sysconfig/ctdb is
still a configuration file.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12125
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
Autobuild-User(master): Martin Schwenke <martins at samba.org>
Autobuild-Date(master): Mon Aug 8 11:30:58 CEST 2016 on sn-devel-144
(cherry picked from commit 464b386d55b0c509b86645bdac7f6d3df489e902)
commit be449dbb3f4092fd71fd61ddbdeae6971aa74c2e
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Mar 24 21:04:25 2015 +1100
ctdb-doc: Document that "ctdb tickle" can now read from stdin
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12123
Although this has been queued for a while, with changes to add stdin
support to the original ctdb tool, this came for free with the
replacement tool.
addtickle and deltickle also now have this feature. However, they're
internal commands and we're not adding new documentation for
internal/debug commands.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 2295f5009dabfc09eec40bb4f30679d76310ce12)
commit 52bff15434ed3aee98a2329c83cc860abac34fd0
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Aug 4 15:16:09 2016 +1000
ctdb-tools: "ctdb tickle" command should run without daemon
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12123
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit f2b319e457eb43410997615f834f0a21fa5e5b0a)
commit a00953225dbaeef908abc57ebb2a1874fae62fda
Author: Amitay Isaacs <amitay at gmail.com>
Date: Fri Aug 5 13:13:08 2016 +1000
ctdb-tools: Cancel transaction on error or if commit fails
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12122
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 4d144d7106d56bbb48669dd35eb324377dd09b59)
commit 34c34998b1a8b137d51413af3c6831cf827dbbef
Author: Amitay Isaacs <amitay at gmail.com>
Date: Fri Aug 5 13:10:28 2016 +1000
ctdb-client: transaction_cancel must free transaction handle
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12122
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 8aa00035faeb307c061dc20e62a0ace7f2a1413b)
commit 533d7e1b911345d76450b221fb86ec8d66289f08
Author: Amitay Isaacs <amitay at gmail.com>
Date: Fri Aug 5 13:56:40 2016 +1000
ctdb-tools: Free temporary memory context before exiting
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 3c51ac48df50a877ded34f3678aeb13f3509570d)
commit 661f90110924358e95cba3a35dd6c0a974bc3c26
Author: Amitay Isaacs <amitay at gmail.com>
Date: Fri Aug 5 13:25:25 2016 +1000
ctdb-tools: Close tdb database on error
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit c9750c821e06364cb4559f857c359c14e6799303)
commit cab7216de287ee9d708f1790976912dc287543e2
Author: Amitay Isaacs <amitay at gmail.com>
Date: Fri Aug 5 12:46:18 2016 +1000
ctdb-tools: Free connection list after processing it
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 2e5e51ebcd3ec8283cdd9c9d13dbe1fc836f8a3d)
commit aa3e881e38b7eb6971e2c0c0074ca57227256444
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Aug 5 11:27:14 2016 +1000
ctdb-tools: Add early return for empty connection list
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
If the connection list is empty then process_clist_send() still
creates a request. However, since no subrequests are created for
controls sent, tevent_req_poll() waits forever for an event.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 1f6835c73245366111946b92605315c0cac84295)
commit 08d6c264d257d8d6dd29acfcd8e3b24f24a39ace
Author: Amitay Isaacs <amitay at gmail.com>
Date: Fri Aug 5 12:43:11 2016 +1000
ctdb-tools: Free tickle list before exiting
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit b54bd763b7a4ff3cd1983a8ccc89b23db5263a4d)
commit e7c238397fb3efeb7e095b8e04badac31c410fa1
Author: Amitay Isaacs <amitay at gmail.com>
Date: Fri Aug 5 12:34:13 2016 +1000
ctdb-tools: Free record if it does not contain valid data
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 814002c9a10227fd6cc13fdc974d2312201d7c19)
commit c1dfac0a2705a6f6243340c107d69d1eababbcff
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Aug 4 15:58:34 2016 +1000
ctdb-tools: Fix CID 1364706 - resource leak
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit bfe891e418fd372c1e7036f08e81b65c27843a79)
commit 66bf88a6e501e410b7172af1ecd956df12edd999
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Aug 4 15:56:23 2016 +1000
ctdb-tools: Fix CID 1364705 - resource leak
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 5f5d9549fcae4b2fa4b99bef3892a24bdbb0eaa9)
commit 15c6776147bf1a1db6e9ac417b4c186bb5ae2521
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Aug 4 15:51:39 2016 +1000
ctdb-tools: Fix CID 1364704 - resource leak
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 45b9c379b590ce0ff03ccaf6c970e0aee1a4b745)
commit 5e6bcb988aee0a8fcabdb34d06ac0590de2c6d01
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Aug 4 15:50:38 2016 +1000
ctdb-tools: Fix CID 1364703 - resource leak
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 94bf6e69dba1b97d90168efceaafa43d27186778)
commit dcae84874e1eab24ad9f7a91ca6bd152c2d5cd07
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Aug 4 15:46:33 2016 +1000
ctdb-tools: Fix CID 1364702 - resource leak
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 10019f7cdfa4b3f5485f063d409aa55ca5f14f6a)
commit a6b4f125816ef8c2e7148d03cff77267d15926df
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Aug 4 15:41:57 2016 +1000
ctdb-tools: Fix CID 1364701 - resource leak
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 25f27e16b26e2c96a35dd7b42d22d16d63be6037)
commit f0fe4f12c5a6e62f8a085af5c7a9bb905adca213
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Aug 4 15:37:33 2016 +1000
ctdb-tools: Fix CID 1364699 - dereference after null check
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12121
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit bf1dab28d1d5887f39739eb29537727d97054c5d)
commit fe1ca7a68f10f739e33521f022a8efa3cb987853
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Aug 5 14:17:01 2016 +1000
ctdb-mutex: Avoid corner case where helper is already reparented to init
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12113
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 1f942ec36c98127e25d7aa9b8370a4f621b9d362)
commit 00d2d4b9e45ce0a73680dbaecc223cb66f30a06d
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Aug 5 16:50:58 2016 +1000
ctdb-daemon: Fix CID 1125627 Resource leak (RESOURCE_LEAK)
Also fixes CID 1125628.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 940272d215049f5f5079aa926e69eae1985a4bfa)
commit fb3314f2ee54909c0363e53fc3eb93829c2114c5
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Aug 5 16:39:50 2016 +1000
ctdb-common: Fix CID 1125585 Dereference after null check (FORWARD_NULL)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit b4f23a7e95cd9c8fc4a6324d4ec5a2881eaec207)
commit 6e8863beb6684e32157ce98ae9f03952d1c5c840
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Aug 5 16:38:45 2016 +1000
ctdb-common: Fix CID 1125583 Dereference after null check (FORWARD_NULL)
This also fixes CID 1125584.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit bbf0b907cb04184515d0f5f09f14824df1c2e59f)
commit 9f0b1e185d5f63d4a18202a9ef2b7b519dea4d63
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Aug 5 16:37:00 2016 +1000
ctdb-common: Fix CID 1125581 Dereference after null check (FORWARD_NULL)
This also fixes CID 1125582.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 7ae3699831427725f12e0a26a0681e59f2fbb2d9)
commit 29c0b81d814cf41593afa44492e0bfb7cf78a443
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Aug 4 15:58:50 2016 +1000
ctdb-tests: Fix CID 1361816 Buffer not null terminated (BUFFER_SIZE_WARNING)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit f802a11d3ba808baba6cb2d31d706952df1e3159)
commit f00245748b49dd0c0b56f2d239d304ee9d439315
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Aug 4 15:50:12 2016 +1000
ctdb-common: Fix CID 1363227 Resource leak (RESOURCE_LEAK)
Occurs on an invalid line that isn't the first. Isn't really a leak
because it is allocated off mem_ctx, which should be freed by the
caller.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 4541301d92e3c140adb6444143ad697d35926179)
commit 2ffc30168e23ea037177ca929398b9a91c9134ea
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Jul 28 14:04:23 2016 +1000
ctdb-mutex: Fix CID 1359217 Resource leak (RESOURCE_LEAK)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
Autobuild-Date(master): Wed Aug 3 09:13:55 CEST 2016 on sn-devel-144
(cherry picked from commit 24e28c0aa52399f03acf830a1ad72af0139b0606)
commit 96395c2e59864a51ca3f2dd6619391e64c5ef20c
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Jul 28 12:06:23 2016 +1000
ctdb-daemon: Fix CID 1363067 Resource leak (RESOURCE_LEAK)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit c6a7f680ce74d4a630fa9305d0a926cc1a4b3d2c)
commit 5d77e762ec5367adc2a74352905e558754e184c3
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Jul 28 12:00:27 2016 +1000
ctdb-daemon: Fix CID 1363233 Resource leak (RESOURCE_LEAK)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 74aca5f4c671d9f15ae6c3a901978a1cf247dd6f)
commit a614e603a9b019b2be38be0da304aa01e7a82f04
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Jul 27 17:43:34 2016 +1000
ctdb-utils: Fix CID 1297451 Explicit null dereferenced (FORWARD_NULL)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit d46960f20e795cd4abc1c727705f77b2f0e0e564)
commit 2c8c82dd7fb110e5f5b7a5955a6d27a8f64c2fa9
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Aug 1 15:03:56 2016 +1000
ctdb-common: Consistently use strlcpy() on interface names
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit aff33a59479cafcb1f24a07ff76383d47bb196b3)
commit 13301d8ec964b8154f33dfc67a83db010dcd2b15
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Jul 27 16:22:36 2016 +1000
ctdb-common: Fix CID 1125553 Buffer not null terminated (BUFFER_SIZE_WARNING)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 763f9c13f2998a8858e8a3ec013d166a3d429835)
commit 38d8bcf89f2796de3dc7318e19fd373fa5e5bb3f
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Jul 28 16:21:44 2016 +1000
ctdb-tests: Add explicit wait to the fork_helper()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
To create a client process that waits after connect(), instead of trying
to do a blocking write(), go to sleep. The parent can then kill the client
process, once testing is done.
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit 049dd07b909dc56a246799f8a96235989a5a605f)
commit 35f777c0154dec833e8f090cb27623af190919f4
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Aug 2 14:52:14 2016 +1000
ctdb-tests: Clean up and rename simple transaction_loop recovery test
* Rename to clarify purpose of test
* Simplify test info to avoid unnecessary bit-rot
* Restart after test since test does heavy database manipulation
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
Pair-programmed-with: Amitay Isaacs <amitay at gmail.com>
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 8ce8e1d7f8c05158f0f5f4e673f3d9a40f94f00d)
commit ea6a9764ebef6b60044a2370a94a4b84ced6775d
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Aug 2 14:50:31 2016 +1000
ctdb-tests: Clean up and rename simple transaction_loop test
* Rename to clarify purpose of test
* Simplify test info to avoid unnecessary bit-rot
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
Pair-programmed-with: Amitay Isaacs <amitay at gmail.com>
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit de04cd578416168290c51f7c4e326b864ab425a4)
commit 106e572077a548f07d7337c6a8337392a92e4307
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Aug 2 15:00:54 2016 +1000
ctdb-tests: Implement --interactive/-i option in transaction_loop
Also add PNNs to output.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
Pair-programmed-with: Amitay Isaacs <amitay at gmail.com>
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 18b41fcb51942ebcd4041fe3e3694712a5a5e43a)
commit 21cbbb19c2193819a024026ca2b985671d78cc93
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Aug 2 14:42:45 2016 +1000
ctdb-tests: Clean up and rename simple fetch_ring test
* Rename to clarify purpose of test
* Simplify test info to avoid unnecessary bit-rot
* Have fetch_ring print PNN for clearer output and update patterns in
test script to suit
* Simplify sanity checking pattern due to less data because of
--interactive/-i option
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
Pair-programmed-with: Amitay Isaacs <amitay at gmail.com>
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit c10dcc7b91df62f740a4789763234f8bb2f0a27f)
commit 10e66ef4672eef6aa5d705d1e0ae772733d186c0
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Aug 2 14:36:45 2016 +1000
ctdb-tests: Implement --interactive/-i option in fetch ring
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
Pair-programmed-with: Amitay Isaacs <amitay at gmail.com>
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit 82cffc2f5759fb73bba37e45fc20b24b30ab0438)
commit 88178499a528bba35f96866ab91d54005993f3b9
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Aug 2 14:47:39 2016 +1000
ctdb-tests: Clean up and rename simple message_ring test
* Rename to clarify purpose of test
* Simplify test info to avoid unnecessary bit-rot
* Have message_ring print PNN for clearer output and update patterns
in test script to suit.
* Drop quantitative percentage check since this is hard to predict
when under extreme load. To compensate, tighten up expectations for
the total number of messages in each direction: at least 10 messages
are required over 10 seconds.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
Pair-programmed-with: Amitay Isaacs <amitay at gmail.com>
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit e7a220377ec14090435f448c9a900f8f8e852a77)
commit 0686be63a54a161094f841ca220ce238aba1398e
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Aug 2 14:19:18 2016 +1000
ctdb-tests: Implement --interactive/-i option in message_ring
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
Pair-programmed-with: Amitay Isaacs <amitay at gmail.com>
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit fbb3ef46b99f4e3ccf710367e50f8b9f89fee52c)
commit c026a3846648c8f26cf93ee47dc8f15ce61c5be5
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Aug 2 14:16:35 2016 +1000
ctdb-tests: Add --interactive/-i option to test options parsing code
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
Pair-programmed-with: Amitay Isaacs <amitay at gmail.com>
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(cherry picked from commit b100d78597959ad314e4f4f6816a8ff14100fb6e)
commit a772738363bdf59a9b25ae961a8219d31025da67
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Aug 1 14:07:04 2016 +1000
ctdb-tests: Stop cross-talk between reclock tests
On a busy system the backgrounded counter reset can survive into the
next test and interfere with its result.
To avoid this, wait until all forks of 01.reclock exit before
continuing on to the next test.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12109
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Mon Aug 1 17:53:27 CEST 2016 on sn-devel-144
(cherry picked from commit 19ed8165bbe374e1ea277fd4dd5a65ee932b4f05)
commit 70a1836bfead045c0ca2002b94e70d28edf35d29
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Aug 4 13:36:28 2016 +1000
ctdb-packaging: Move ctdb tests to libexec directory
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12104
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 87c38d5d741f5e58f643ad4f797c523c67bbab00)
commit ca1ef4d891a69180383e1927a935c405a8e6ecc9
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 3 13:23:31 2016 +0200
ctdb-waf: Move ctdb tests to libexec directory
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12104
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(cherry picked from commit f9c85d04e9edb3af9479e9c83d5b1ec77b9c2ee2)
commit 0791bd6daeea19c2abd7a673f93f59124f9c3919
Author: Marc Muehlfeld <mmuehlfeld at samba.org>
Date: Sat Jul 16 20:14:15 2016 +0200
man: Wrong option for parameter ldap ssl in smb.conf man page
- "ldap ssl" does not accept the value "yes"
- Replaced "start_tls" with "start tls".
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12023
Signed-off-by: Marc Muehlfeld <mmuehlfeld at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 976be8fe39c78acfd3c2a23302d26cc262be0ae0)
commit 3cf958d078c3f18182d3ce9117dbbd2bee2ca65a
Author: Ralph Boehme <slow at samba.org>
Date: Wed Aug 3 15:00:45 2016 +0200
async_req: make async_connect_send() "reentrant"
Allow callers to pass in socket fds that where already passed to an
earlier call of async_connect_send(). Callers expect this behaviour and
it was working until 05d4dbda8357712cb81008e0d611fdb0e7239587 broke it.
The proper fix would be to change callers to close the fd and start from
scratch with a fresh socket.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12105
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Thu Aug 4 05:03:21 CEST 2016 on sn-devel-144
(cherry picked from commit 9c6a4ea2788808bdcc7bfea798d838ea56c3b5ec)
commit d4e59925669f7ae5ee9466909e77872781f6d34b
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Aug 3 09:44:52 2016 +0200
docs: Bump version up to 4.5.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
commit de3d1f3e652b591499515680bae7f62d9dfff606
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Aug 3 09:42:00 2016 +0200
WHATSNEW: Start release notes for Samba 4.5.0rc2.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 102 +++++++++++----------
ctdb/client/client_db.c | 3 +
ctdb/common/rb_tree.c | 6 +-
ctdb/common/system_linux.c | 8 +-
ctdb/common/system_util.c | 1 +
ctdb/doc/cluster_mutex_helper.txt | 3 +-
ctdb/doc/ctdb.1.xml | 23 +++--
ctdb/packaging/RPM/ctdb.spec.in | 15 ++-
ctdb/server/ctdb_control.c | 4 +-
ctdb/server/ctdb_logging.c | 9 +-
ctdb/server/ctdb_mutex_fcntl_helper.c | 24 ++++-
ctdb/server/ctdb_recover.c | 2 +
ctdb/tests/eventscripts/scripts/local.sh | 11 +++
ctdb/tests/simple/51_ctdb_bench.sh | 92 -------------------
ctdb/tests/simple/51_message_ring.sh | 66 +++++++++++++
ctdb/tests/simple/52_ctdb_fetch.sh | 64 -------------
ctdb/tests/simple/52_fetch_ring.sh | 46 ++++++++++
..._ctdb_transaction.sh => 53_transaction_loop.sh} | 15 +--
...recovery.sh => 54_transaction_loop_recovery.sh} | 18 +---
ctdb/tests/src/fake_ctdbd.c | 4 +-
ctdb/tests/src/fetch_ring.c | 15 ++-
ctdb/tests/src/message_ring.c | 19 ++--
ctdb/tests/src/porting_tests.c | 17 ++--
ctdb/tests/src/test_options.c | 3 +
ctdb/tests/src/test_options.h | 1 +
ctdb/tests/src/transaction_loop.c | 19 ++--
ctdb/tools/ctdb.c | 56 +++++++++--
ctdb/utils/ping_pong/ping_pong.c | 4 +-
ctdb/wscript | 24 ++---
docs-xml/manpages/cifsdd.8.xml | 2 +-
docs-xml/manpages/dbwrap_tool.1.xml | 2 +-
docs-xml/manpages/eventlogadm.8.xml | 2 +-
docs-xml/manpages/findsmb.1.xml | 2 +-
docs-xml/manpages/idmap_ad.8.xml | 2 +-
docs-xml/manpages/idmap_autorid.8.xml | 2 +-
docs-xml/manpages/idmap_hash.8.xml | 2 +-
docs-xml/manpages/idmap_ldap.8.xml | 2 +-
docs-xml/manpages/idmap_nss.8.xml | 2 +-
docs-xml/manpages/idmap_rfc2307.8.xml | 2 +-
docs-xml/manpages/idmap_rid.8.xml | 2 +-
docs-xml/manpages/idmap_script.8.xml | 2 +-
docs-xml/manpages/idmap_tdb.8.xml | 2 +-
docs-xml/manpages/idmap_tdb2.8.xml | 2 +-
docs-xml/manpages/libsmbclient.7.xml | 2 +-
docs-xml/manpages/lmhosts.5.xml | 2 +-
docs-xml/manpages/log2pcap.1.xml | 2 +-
docs-xml/manpages/net.8.xml | 2 +-
docs-xml/manpages/nmbd.8.xml | 2 +-
docs-xml/manpages/nmblookup.1.xml | 2 +-
docs-xml/manpages/ntlm_auth.1.xml | 2 +-
docs-xml/manpages/pam_winbind.8.xml | 2 +-
docs-xml/manpages/pam_winbind.conf.5.xml | 2 +-
docs-xml/manpages/pdbedit.8.xml | 2 +-
docs-xml/manpages/profiles.1.xml | 2 +-
docs-xml/manpages/rpcclient.1.xml | 2 +-
docs-xml/manpages/samba-regedit.8.xml | 2 +-
docs-xml/manpages/samba-tool.8.xml | 2 +-
docs-xml/manpages/samba.7.xml | 2 +-
docs-xml/manpages/samba.8.xml | 2 +-
docs-xml/manpages/sharesec.1.xml | 2 +-
docs-xml/manpages/smb.conf.5.xml | 2 +-
docs-xml/manpages/smbcacls.1.xml | 2 +-
docs-xml/manpages/smbclient.1.xml | 2 +-
docs-xml/manpages/smbcontrol.1.xml | 2 +-
docs-xml/manpages/smbcquotas.1.xml | 2 +-
docs-xml/manpages/smbd.8.xml | 2 +-
docs-xml/manpages/smbget.1.xml | 2 +-
docs-xml/manpages/smbgetrc.5.xml | 2 +-
docs-xml/manpages/smbpasswd.5.xml | 2 +-
docs-xml/manpages/smbpasswd.8.xml | 2 +-
docs-xml/manpages/smbspool.8.xml | 2 +-
docs-xml/manpages/smbspool_krb5_wrapper.8.xml | 2 +-
docs-xml/manpages/smbstatus.1.xml | 2 +-
docs-xml/manpages/smbtar.1.xml | 2 +-
docs-xml/manpages/smbtree.1.xml | 2 +-
docs-xml/manpages/testparm.1.xml | 2 +-
docs-xml/manpages/vfs_acl_tdb.8.xml | 2 +-
docs-xml/manpages/vfs_acl_xattr.8.xml | 2 +-
docs-xml/manpages/vfs_aio_fork.8.xml | 2 +-
docs-xml/manpages/vfs_aio_linux.8.xml | 2 +-
docs-xml/manpages/vfs_aio_pthread.8.xml | 2 +-
docs-xml/manpages/vfs_audit.8.xml | 2 +-
docs-xml/manpages/vfs_btrfs.8.xml | 2 +-
docs-xml/manpages/vfs_cacheprime.8.xml | 2 +-
docs-xml/manpages/vfs_cap.8.xml | 2 +-
docs-xml/manpages/vfs_catia.8.xml | 2 +-
docs-xml/manpages/vfs_ceph.8.xml | 2 +-
docs-xml/manpages/vfs_commit.8.xml | 2 +-
docs-xml/manpages/vfs_crossrename.8.xml | 2 +-
docs-xml/manpages/vfs_default_quota.8.xml | 2 +-
docs-xml/manpages/vfs_dirsort.8.xml | 2 +-
docs-xml/manpages/vfs_extd_audit.8.xml | 2 +-
docs-xml/manpages/vfs_fake_perms.8.xml | 2 +-
docs-xml/manpages/vfs_fileid.8.xml | 2 +-
docs-xml/manpages/vfs_fruit.8.xml | 2 +-
docs-xml/manpages/vfs_full_audit.8.xml | 2 +-
docs-xml/manpages/vfs_glusterfs.8.xml | 2 +-
docs-xml/manpages/vfs_gpfs.8.xml | 2 +-
docs-xml/manpages/vfs_linux_xfs_sgid.8.xml | 2 +-
docs-xml/manpages/vfs_media_harmony.8.xml | 2 +-
docs-xml/manpages/vfs_netatalk.8.xml | 2 +-
docs-xml/manpages/vfs_offline.8.xml | 2 +-
docs-xml/manpages/vfs_prealloc.8.xml | 2 +-
docs-xml/manpages/vfs_preopen.8.xml | 2 +-
docs-xml/manpages/vfs_readahead.8.xml | 2 +-
docs-xml/manpages/vfs_readonly.8.xml | 2 +-
docs-xml/manpages/vfs_recycle.8.xml | 2 +-
docs-xml/manpages/vfs_shadow_copy.8.xml | 2 +-
docs-xml/manpages/vfs_shadow_copy2.8.xml | 2 +-
docs-xml/manpages/vfs_shell_snap.8.xml | 2 +-
docs-xml/manpages/vfs_snapper.8.xml | 2 +-
docs-xml/manpages/vfs_streams_depot.8.xml | 2 +-
docs-xml/manpages/vfs_streams_xattr.8.xml | 2 +-
docs-xml/manpages/vfs_syncops.8.xml | 2 +-
docs-xml/manpages/vfs_time_audit.8.xml | 2 +-
docs-xml/manpages/vfs_tsmsm.8.xml | 2 +-
docs-xml/manpages/vfs_unityed_media.8.xml | 2 +-
docs-xml/manpages/vfs_worm.8.xml | 2 +-
docs-xml/manpages/vfs_xattr_tdb.8.xml | 2 +-
docs-xml/manpages/vfs_zfsacl.8.xml | 2 +-
docs-xml/manpages/vfstest.1.xml | 2 +-
docs-xml/manpages/wbinfo.1.xml | 2 +-
docs-xml/manpages/winbind_krb5_locator.7.xml | 2 +-
docs-xml/manpages/winbindd.8.xml | 2 +-
docs-xml/smbdotconf/ldap/ldapssl.xml | 4 +-
lib/async_req/async_sock.c | 16 +++-
source3/lib/dbwrap/dbwrap_ctdb.c | 27 +++++-
source3/lib/dbwrap/dbwrap_watch.c | 3 +-
source3/locking/share_mode_lock.c | 6 ++
source3/modules/wscript_build | 1 +
source3/wscript | 16 +++-
source4/torture/smb2/lock.c | 64 +++++++++++++
132 files changed, 591 insertions(+), 410 deletions(-)
delete mode 100755 ctdb/tests/simple/51_ctdb_bench.sh
create mode 100755 ctdb/tests/simple/51_message_ring.sh
delete mode 100755 ctdb/tests/simple/52_ctdb_fetch.sh
create mode 100755 ctdb/tests/simple/52_fetch_ring.sh
rename ctdb/tests/simple/{53_ctdb_transaction.sh => 53_transaction_loop.sh} (61%)
rename ctdb/tests/simple/{54_ctdb_transaction_recovery.sh => 54_transaction_loop_recovery.sh} (71%)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 25da528..418a1f8 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,7 +1,7 @@
Release Announcements
=====================
-This is the first preview release of Samba 4.5. This is *not*
+This is the second release candidate of Samba 4.5. 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/.
@@ -18,11 +18,11 @@ NTLMv1 authentication disabled by default
In order to improve security we have changed
the default value for the "ntlm auth" option from
"yes" to "no". This may have impact on very old
-client which doesn't support NTLMv2 yet.
+clients which doesn't support NTLMv2 yet.
The primary user of NTLMv1 is MSCHAPv2 for VPNs and 802.1x.
-By default Samba will only allow NTLMv2 via NTLMSSP now,
+By default, Samba will only allow NTLMv2 via NTLMSSP now,
as we have the following default "lanman auth = no",
"ntlm auth = no" and "raw NTLMv2 auth = no".
@@ -34,7 +34,7 @@ Support for LDAP_SERVER_NOTIFICATION_OID
----------------------------------------
The ldap server has support for the LDAP_SERVER_NOTIFICATION_OID
-control. This can be used to monitor the active directory database
+control. This can be used to monitor the Active Directory database
for changes.
KCC improvements for sparse network replication
@@ -72,7 +72,7 @@ Schema updates are also handled much more reliably.
samba-tool drs replicate with new options
-----------------------------------------
-samba-tool drs replicate got two new options:
+'samba-tool drs replicate' got two new options:
The option '--local-online' will do the DsReplicaSync() via IRPC
to the local dreplsrv service.
@@ -85,7 +85,7 @@ replPropertyMetaData Changes
During the development of the DRS replication, tests showed that Samba
stores the replPropertyMetaData object incorrectly. To address this,
-be aware that dbcheck will now detect and offer to fix all objects in
+be aware that 'dbcheck' will now detect and offer to fix all objects in
the domain for this error.
Linked attributes on deleted objects
@@ -93,7 +93,7 @@ Linked attributes on deleted objects
In Active Directory, an object that has been tombstoned or recycled
has no linked attributes. However, Samba incorrectly maintained such
-links, slowing replication and run-time performance. dbcheck now
+links, slowing replication and run-time performance. 'dbcheck' now
offers to remove such links, and they are no longer kept after the
object is tombstoned or recycled.
@@ -101,13 +101,13 @@ Improved AD DC performance
--------------------------
Many other improvements have been made to our LDAP database layer in
-the AD DC, to improve performance, both during samba-tool domain
-provision and at runtime.
+the AD DC, to improve performance, both during 'samba-tool domain
+provision' and at runtime.
Other dbcheck improvements
--------------------------
- - samba-tool dbcheck can now find and fix a missing or corrupted
+ - 'samba-tool dbcheck' can now find and fix a missing or corrupted
'deleted objects' container.
- BUG 11433: samba-dbcheck no longer offers to resort auxiliary class values
in objectClass as these were then re-sorted at the next dbcheck indefinitely.
@@ -123,19 +123,18 @@ Multiple DNS Forwarders on the AD DC
------------------------------------
Multiple DNS forwarders are now supported on the AD DC, allowing
-samba to fall back between two different DNS servers for forwarded queries.
+Samba to fall back between two different DNS servers for forwarded queries.
Password quality plugin support in the AD DC
--------------------------------------------
-The check password script now operates correctly in the AD DC (this
-was silently ignored in past releases)
+The check password script now operates correctly in the AD DC.
pwdLastSet is now correctly honoured
------------------------------------
-BUG 9654: the pwdLastSet attribute is now correctly handled (this previously
-permitted passwords that next expire).
+BUG 9654: The pwdLastSet attribute is now correctly handled (this previously
+permitted passwords that expire next).
net ads dns unregister
----------------------
@@ -143,10 +142,10 @@ net ads dns unregister
It is now possible to remove the DNS entries created with 'net ads register'
with the matching 'net ads unregister' command.
-Samba-tool improvements
+samba-tool improvements
------------------------
-Running samba-tool on the command line should now be a lot snappier. The tool
+Running 'samba-tool' on the command line should now be a lot snappier. The tool
now only loads the code specific to the subcommand that you wish to run.
SMB 2.1 Leases enabled by default
@@ -169,7 +168,7 @@ descriptors having file locks are opened onto the same file. An internal
tunable "smbd:force process locks = true" may be used to turn off OFD
locks if there appear to be problems with them.
-Password sync as active directory domain controller
+Password sync as Active Directory domain controller
---------------------------------------------------
The new commands 'samba-tool user getpassword'
@@ -180,71 +179,71 @@ If compiled with GPGME support (--with-gpgme) it's
possible to store cleartext passwords in a PGP/OpenGPG
encrypted form by configuring the new "password hash gpg key ids"
option. This requires gpgme devel and python packages to be installed
-(e.g. libgpgme11-dev and python-gpgme on debian/ubuntu).
+(e.g. libgpgme11-dev and python-gpgme on Debian/Ubuntu).
Python crypto requirements
--------------------------
-Some samba-tool subcommands require python-crypto and/or
+Some 'samba-tool' subcommands require python-crypto and/or
python-m2crypto packages to be installed.
SmartCard/PKINIT improvements
-----------------------------
-"samba-tool user create" accepts --smartcard-required
-and "samba-tool user setpassword" accepts --smartcard-required
-and --clear-smartcard-required.
+'samba-tool user create' accepts "--smartcard-required"
+and 'samba-tool user setpassword' accepts "--smartcard-required"
+and "--clear-smartcard-required".
-Specifying --smartcard-required results in the UF_SMARTCARD_REQUIRED
+Specifying "--smartcard-required" results in the UF_SMARTCARD_REQUIRED
flags being set in the userAccountControl attribute.
-At the same time the account password is reset to a random
+At the same time, the account password is reset to a random
NTHASH value.
Interactive password logons are rejected, if the UF_SMARTCARD_REQUIRED
bit is set in the userAccountControl attribute of a user.
-When doing a PKINIT based kerberos logon the KDC adds the
+When doing a PKINIT based Kerberos logon the KDC adds the
required PAC_CREDENTIAL_INFO element to the authorization data.
That means the NTHASH is shared between the PKINIT based client and
the domain controller, which allows the client to do NTLM based
-authentication on behalf of the user. It also allows on offline
+authentication on behalf of the user. It also allows an offline
logon using a smartcard to work on Windows clients.
CTDB changes
------------
-* New improved ctdb tool
+* New improved 'ctdb tool'
- ctdb tool has been completely rewritten using new client API.
+ 'ctdb tool' has been completely rewritten using new client API.
Usage messages are much improved.
* Sample CTDB configuration file is installed as ctdbd.conf.
* The use of real-time scheduling when taking locks has been narrowed
- to limit potential performance impacts on nodes
+ to limit potential performance impacts on nodes.
* CTDB_RECOVERY_LOCK now supports specification of an external helper
- to take and hold the recovery lock
+ to take and hold the recovery lock.
See the RECOVERY LOCK section in ctdb(7) for details. Documentation
for writing helpers is provided in doc/cluster_mutex_helper.txt.
* "ctdb natgwlist" has been replaced by a top level "ctdb natgw"
- command that has "master", "list" and "status" subcommands
+ command that has "master", "list" and "status" subcommands.
-* The onnode command no longer supports the "recmaster", "lvs" and
- "natgw" node specifications
+* The 'onnode' command no longer supports the "recmaster", "lvs" and
+ "natgw" node specifications.
* Faster resetting of TCP connections to public IP addresses during
- failover
+ failover.
* Tunables MaxRedirectCount, ReclockPingPeriod,
- DeferredRebalanceOnNodeAdd are now obsolete/ignored
+ DeferredRebalanceOnNodeAdd are now obsolete/ignored.
-* "ctdb listvars" now lists all variables, including the first one
+* "ctdb listvars" now lists all variables, including the first one.
* "ctdb xpnn", "ctdb rebalanceip" and "ctdb rebalancenode" have been
- removed
+ removed.
These are not needed because "ctdb reloadips" should do the correct
rebalancing.
@@ -270,30 +269,30 @@ CTDB changes
ctdb setdebug
ctdb uptime
-* "ctdb process-exists" has been updated to only take a PID argument
+* 'ctdb process-exists' has been updated to only take a PID argument.
The PNN can be specified with -n <PNN>. Output also cleaned up.
* LVS support has been reworked - related commands and configuration
- variables have changed
+ variables have changed.
- "ctdb lvsmaster" and "ctdb lvs" have been replaced by a top level
- "ctdb lvs" command that has "master", "list" and "status"
+ 'ctdb lvsmaster' and 'ctdb lvs' have been replaced by a top level
+ 'ctdb lvs' command that has 'master', 'list' and 'status'
subcommands.
See the LVS sections in ctdb(7) and ctdbd.conf(5) for details,
including configuration changes.
-* Improved sample NFS Ganesha call-out
+* Improved sample NFS Ganesha call-out.
New shadow_copy2 options
------------------------
-shadow:snapprefix
+* shadow:snapprefix
With growing number of snapshots file-systems need some mechanism to
differentiate one set of snapshots from other, e.g. monthly, weekly, manual,
- special events, etc. Therefore these file-systems provide different ways to tag
+ special events, etc. Therefore, these file-systems provide different ways to tag
snapshots, e.g. provide a configurable way to name snapshots, which is not just
based on time. With only shadow:format it is very difficult to filter these
snapshots. With this optional parameter, one can specify a variable prefix
@@ -302,10 +301,10 @@ shadow:snapprefix
parameters it determines the possible names of snapshot directories in the
file-system. The option only supports Basic Regular Expression (BRE).
-shadow:delimiter
+* shadow:delimiter
- This optional parameter is used as a delimiter between shadow:snapprefix and
- shadow:format This parameter is used only when shadow:snapprefix is set.
+ This optional parameter is used as a delimiter between "shadow:snapprefix" and
+ "shadow:format". This parameter is used only when "shadow:snapprefix" is set.
Default: shadow:delimiter = "_GMT"
@@ -315,6 +314,7 @@ REMOVED FEATURES
only user and username parameters
---------------------------------
+
These two parameters have long been deprecated and superseded by
"valid users" and "invalid users".
@@ -339,6 +339,12 @@ KNOWN ISSUES
Currently none.
+
+CHANGES SINCE 4.5.0rc1
+======================
+
+
+
#######################################
Reporting bugs & Development Discussion
#######################################
diff --git a/ctdb/client/client_db.c b/ctdb/client/client_db.c
index 98de1b8..794119d 100644
--- a/ctdb/client/client_db.c
+++ b/ctdb/client/client_db.c
@@ -2304,6 +2304,7 @@ static void ctdb_transaction_cancel_done(struct tevent_req *subreq)
DEBUG(DEBUG_ERR,
("transaction_cancel: %s g_lock unlock failed, ret=%d\n",
state->h->db->db_name, ret));
+ talloc_free(state->h);
tevent_req_error(req, ret);
return;
}
@@ -2336,6 +2337,7 @@ int ctdb_transaction_cancel(struct ctdb_transaction_handle *h)
mem_ctx = talloc_new(NULL);
if (mem_ctx == NULL) {
+ talloc_free(h);
return ENOMEM;
}
@@ -2343,6 +2345,7 @@ int ctdb_transaction_cancel(struct ctdb_transaction_handle *h)
tevent_timeval_zero(), h);
if (req == NULL) {
talloc_free(mem_ctx);
+ talloc_free(h);
return ENOMEM;
}
diff --git a/ctdb/common/rb_tree.c b/ctdb/common/rb_tree.c
index 1c602a7..990ec61 100644
--- a/ctdb/common/rb_tree.c
+++ b/ctdb/common/rb_tree.c
@@ -216,21 +216,21 @@ static inline int trbt_get_color_right(trbt_node_t *node)
/* setting a NULL node to black is a nop */
static inline void trbt_set_color(trbt_node_t *node, int color)
{
- if ( (node==NULL) && (color==TRBT_BLACK) ) {
+ if (node == NULL) {
return;
}
node->rb_color = color;
}
static inline void trbt_set_color_left(trbt_node_t *node, int color)
{
- if ( ((node==NULL)||(node->left==NULL)) && (color==TRBT_BLACK) ) {
+ if (node == NULL || node->left == NULL) {
return;
}
node->left->rb_color = color;
}
static inline void trbt_set_color_right(trbt_node_t *node, int color)
{
- if ( ((node==NULL)||(node->right==NULL)) && (color==TRBT_BLACK) ) {
+ if (node == NULL || node->right == NULL) {
return;
}
node->right->rb_color = color;
diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c
index ef78df8..b66ce67 100644
--- a/ctdb/common/system_linux.c
+++ b/ctdb/common/system_linux.c
@@ -116,7 +116,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
}
/* get the mac address */
- strncpy(if_hwaddr.ifr_name, iface, sizeof(if_hwaddr.ifr_name)-1);
+ strlcpy(if_hwaddr.ifr_name, iface, sizeof(if_hwaddr.ifr_name));
ret = ioctl(s, SIOCGIFHWADDR, &if_hwaddr);
if ( ret < 0 ) {
close(s);
@@ -202,7 +202,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
}
DEBUG(DEBUG_DEBUG, (__location__ " Created SOCKET FD:%d for sending arp\n", s));
- strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
+ strlcpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
DEBUG(DEBUG_CRIT,(__location__ " interface '%s' not found\n", iface));
close(s);
@@ -210,7 +210,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
}
/* get the mac address */
- strncpy(if_hwaddr.ifr_name, iface, sizeof(if_hwaddr.ifr_name)-1);
+ strlcpy(if_hwaddr.ifr_name, iface, sizeof(if_hwaddr.ifr_name));
ret = ioctl(s, SIOCGIFHWADDR, &if_hwaddr);
if ( ret < 0 ) {
close(s);
@@ -602,7 +602,7 @@ bool ctdb_sys_check_iface_exists(const char *iface)
return true;
}
- strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)-1);
+ strlcpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFINDEX, &ifr) < 0 && errno == ENODEV) {
DEBUG(DEBUG_CRIT,(__location__ " interface '%s' not found\n", iface));
close(s);
diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c
index ea53f5d..9fc6c44 100644
--- a/ctdb/common/system_util.c
+++ b/ctdb/common/system_util.c
@@ -420,6 +420,7 @@ int ctdb_parse_connections(FILE *fp, TALLOC_CTX *mem_ctx,
if (ret != 2) {
DEBUG(DEBUG_ERR, ("Bad line [%d]: %s\n",
line_num, line));
+ talloc_free(conn);
return EINVAL;
}
diff --git a/ctdb/doc/cluster_mutex_helper.txt b/ctdb/doc/cluster_mutex_helper.txt
index 0fc3a50..20c8eb2 100644
--- a/ctdb/doc/cluster_mutex_helper.txt
+++ b/ctdb/doc/cluster_mutex_helper.txt
@@ -64,7 +64,8 @@ Valid status codes are:
If a 0 status code is sent then it the helper should periodically
check if the (original) parent processes still exists while awaiting
termination. If the parent process disappears then the helper should
-release the mutex and exit. This avoids stale mutexes.
+release the mutex and exit. This avoids stale mutexes. Note that a
+helper should never wait for parent process ID 1!
If a non-0 status code is sent then the helper can exit immediately.
However, if the helper does not exit then it must terminate if it
diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index 7878c4c..9324813 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -1440,13 +1440,24 @@ RUNNING
</refsect2>
<refsect2>
- <title>tickle <parameter>SRC-IPADDR</parameter>:<parameter>SRC-PORT</parameter> <parameter>DST-IPADDR</parameter>:<parameter>DST-PORT</parameter></title>
+ <title>tickle</title>
<para>
- Send a TCP tickle to the source host for the specified TCP
- connection. A TCP tickle is a TCP ACK packet with an invalid
- sequence and acknowledge number and will when received by the
- source host result in it sending an immediate correct ACK back
- to the other end.
+ Read a list of TCP connections, one per line, from standard
+ input and send a TCP tickle to the source host for each
+ connection. A connection is specified as:
+ </para>
+ <synopsis>
+ <parameter>SRC-IPADDR</parameter>:<parameter>SRC-PORT</parameter> <parameter>DST-IPADDR</parameter>:<parameter>DST-PORT</parameter>
+ </synopsis>
+ <para>
+ A single connection can be specified on the command-line
+ rather than on standard input.
+ </para>
+ <para>
+ A TCP tickle is a TCP ACK packet with an invalid sequence and
+ acknowledge number and will when received by the source host
+ result in it sending an immediate correct ACK back to the
+ other end.
</para>
<para>
TCP tickles are useful to "tickle" clients after a IP failover has
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index b439e27..ea97d8e 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -115,6 +115,15 @@ DESTDIR=$RPM_BUILD_ROOT ./buildtools/bin/waf install
install -m644 config/ctdbd.conf $RPM_BUILD_ROOT%{_sysconfdir}/ctdb
+# Add a pointer to modern location for configuration file. Allow with
+# "noreplace" in the files section, this stops RPM moving aside a
+# working configuration.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb <<EOF
+# CTDB configuration is now in %{_sysconfdir}/ctdb/ctdbd.conf
+EOF
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
+
%if %{with_systemd}
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
install -m 755 config/ctdb.service $RPM_BUILD_ROOT%{_unitdir}
@@ -151,6 +160,8 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/ctdb/gcore_trace.sh
%config(noreplace) %{_sysconfdir}/ctdb/debug_locks.sh
+%config(noreplace, missingok) %{_sysconfdir}/sysconfig/ctdb
+
%if %{with_systemd}
%{_unitdir}/ctdb.service
%else
@@ -248,8 +259,8 @@ test suite for ctdb
%defattr(-,root,root)
%dir %{_datadir}/%{name}-tests
%{_datadir}/%{name}-tests/*
-%dir %{_libdir}/%{name}-tests
-%{_libdir}/%{name}-tests/*
+%dir %{_libexecdir}/%{name}/tests
+%{_libexecdir}/%{name}/tests/*
%{_bindir}/ctdb_run_tests
%{_bindir}/ctdb_run_cluster_tests
%doc tests/README
diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index f01815c..4c66483 100644
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -565,10 +565,10 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
return ctdb_control_get_ban_state(ctdb, outdata);
case CTDB_CONTROL_SET_DB_PRIORITY:
- return control_not_implemented("SET_DB_PRIORITY", "");
+ return control_not_implemented("SET_DB_PRIORITY", NULL);
--
Samba Shared Repository
More information about the samba-cvs
mailing list