[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3fcd937 selftest: tests for kerberos encryption types via 1f90983 heimdal: honor conf enctypes when obtaining a service ticket via 3fff266 libads: use "kerberos encryption types" parameter via 513fa31 s3-param: add kerberos encryption types parameter from 25df582 dbwrap_ctdb: treat empty records in ltdb as non-existing https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3fcd937f053e378a99d7886a6e53031462ffc2d9 Author: Uri SimchoniDate: Tue Jul 5 06:07:04 2016 +0300 selftest: tests for kerberos encryption types This test uses tshark and cwrap's packet capturing capability to observe the Kerberos handshakes and ensure the correct encryption types are being used. Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Aug 9 07:43:52 CEST 2016 on sn-devel-144 commit 1f90983324b9f5804dc57f87c5f7695b0e53db8d Author: Uri Simchoni Date: Mon Jul 4 09:50:33 2016 +0300 heimdal: honor conf enctypes when obtaining a service ticket This patch removes part of what's categorized in the code as "hideous glue", which causes Heimdal to ignore krb5.conf encryption types, and instead use either the application- supplied values or the default compile-time values. Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison commit 3fff2667ec3f12fe1263735095c1a39182b0d351 Author: Uri Simchoni Date: Mon May 30 21:21:41 2016 +0300 libads: use "kerberos encryption types" parameter When creating the custom krb.conf file, list etypes according to kerberos encryption types Also use proper directives for heimdal (heimdal recognizes the MIT etype directives, but does not act upon them) Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison commit 513fa31c85650e0767e5dc1b3b94a4cc652030e6 Author: Uri Simchoni Date: Sun May 8 15:45:44 2016 +0300 s3-param: add kerberos encryption types parameter Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison --- Summary of changes: .../security/kerberosencryptiontypes.xml | 53 +++ lib/param/loadparm.c | 2 + lib/param/loadparm.h | 4 + lib/param/param_table.c| 9 ++ source3/libads/kerberos.c | 106 - source4/heimdal/lib/gssapi/krb5/init_sec_context.c | 11 +-- source4/selftest/tests.py | 3 + testprogs/blackbox/test_client_etypes.sh | 58 +++ 8 files changed, 213 insertions(+), 33 deletions(-) create mode 100644 docs-xml/smbdotconf/security/kerberosencryptiontypes.xml create mode 100755 testprogs/blackbox/test_client_etypes.sh Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml b/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml new file mode 100644 index 000..b19a8a8 --- /dev/null +++ b/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml @@ -0,0 +1,53 @@ +http://www.samba.org/samba/DTD/samba-doc;> + +This parameter determines the encryption types to use when operating +as a Kerberos client. Possible values are all, +strong, and legacy. + + +Samba uses a Kerberos library (MIT or Heimdal) to obtain Kerberos +tickets. This library is normally configured outside of Samba, using +the krb5.conf file. This file may also include directives to configure +the encryption types to be used. However, Samba implements Active Directory +protocols and algorithms to locate a domain controller. In order to +force the Kerberos library into using the correct domain controller, +some Samba processes, such as +winbindd +8 and +net +8, build a private krb5.conf +file for use by the Kerberos library while being invoked from Samba. +This private file controls all aspects of the Kerberos library operation, +and this parameter controls how the encryption types are configured +within this generated file, and therefore also controls the encryption +types negotiable by Samba. + + +When set to all, all active directory +encryption types are allowed. + + +When set to strong, only AES-based encyption +types are offered. This can be used in hardened environments to prevent +downgrade attacks. + + +When set to legacy, only RC4-HMAC-MD5 +is allowed. Avoiding AES this way
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-09-0651/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-09-0651/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-09-0651/samba.stdout The top commit at the time of the failure was: commit 14f29c4f560f1b3942245a6fa43924a8ce45d99d Author: Ira CooperDate: 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 Reviewed-by: Steve French Tested-by: Steve French Autobuild-User(master): Ira Cooper Autobuild-Date(master): Mon Aug 8 21:27:46 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 25df582 dbwrap_ctdb: treat empty records in ltdb as non-existing via b17e2f5 s4/torture: add a test for ctdb-tombstrone-record deadlock from 14f29c4 buildscripts: Fix the regression with --without-acl-support. https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 25df582739918b7afd4e5497eaffe279e2d92cd1 Author: Ralph BoehmeDate: 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 Signed-off-by: Ralph Boehme Signed-off-by: Michael Adam Autobuild-User(master): Michael Adam Autobuild-Date(master): Tue Aug 9 04:38:44 CEST 2016 on sn-devel-144 commit b17e2f5c740fb081c007ed2e1c23138ffcba1469 Author: Ralph Boehme 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 Signed-off-by: Ralph Boehme Signed-off-by: Michael Adam --- Summary of changes: source3/lib/dbwrap/dbwrap_ctdb.c | 27 - source4/torture/smb2/lock.c | 64 2 files changed, 90 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index d86d078..10f5f50 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -1221,6 +1221,7 @@ struct db_ctdb_parse_record_state { uint32_t my_vnn; bool ask_for_readonly_copy; bool done; + bool empty_record; }; static void db_ctdb_parse_record_parser( @@ -1240,7 +1241,16 @@ static void db_ctdb_parse_record_parser_nonpersistent( (struct db_ctdb_parse_record_state *)private_data; if (db_ctdb_can_use_local_hdr(header, state->my_vnn, true)) { - state->parser(key, data, state->private_data); + /* +* A record consisting only of the ctdb header can be +* a validly created empty record or a tombstone +* record of a deleted record (not vacuumed yet). Mark +* it accordingly. +*/ + state->empty_record = (data.dsize == 0); + if (!state->empty_record) { + state->parser(key, data, state->private_data); + } state->done = true; } else { /* @@ -1267,6 +1277,7 @@ static NTSTATUS db_ctdb_parse_record(struct db_context *db, TDB_DATA key, state.parser = parser; state.private_data = private_data; state.my_vnn = ctdbd_vnn(ctx->conn); + state.empty_record = false; if (ctx->transaction != NULL) { struct db_ctdb_transaction_handle *h = ctx->transaction; @@ -1298,6 +1309,20 @@ static NTSTATUS db_ctdb_parse_record(struct db_context *db, TDB_DATA key, status = db_ctdb_ltdb_parse( ctx, key, db_ctdb_parse_record_parser_nonpersistent, ); if (NT_STATUS_IS_OK(status) && state.done) { + if (state.empty_record) { + /* +
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-09-0254/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-09-0254/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-09-0254/samba.stdout The top commit at the time of the failure was: commit 14f29c4f560f1b3942245a6fa43924a8ce45d99d Author: Ira CooperDate: 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 Reviewed-by: Steve French Tested-by: Steve French Autobuild-User(master): Ira Cooper Autobuild-Date(master): Mon Aug 8 21:27:46 CEST 2016 on sn-devel-144
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-2249/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-2249/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-2249/samba.stdout The top commit at the time of the failure was: commit a0e60e96aa38407ded8d63650dcf8f39304c958a Author: Stefan MetzmacherDate: Mon Aug 8 12:53:26 2016 +0200 samba-tool/ldapcmp: ignore differences of whenChanged This is implicitly replicated, but may diverge on updates of non-replicated attributes. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12129 Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Mon Aug 8 17:34:24 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 14f29c4 buildscripts: Fix the regression with --without-acl-support. via 38bb993 source3/wscript: Add support for disabling vfs_cephfs from a0e60e9 samba-tool/ldapcmp: ignore differences of whenChanged https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 14f29c4f560f1b3942245a6fa43924a8ce45d99d Author: Ira CooperDate: 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 Reviewed-by: Steve French Tested-by: Steve French Autobuild-User(master): Ira Cooper Autobuild-Date(master): Mon Aug 8 21:27:46 CEST 2016 on sn-devel-144 commit 38bb993657f8eb6c49899de0d741ed5186ca5022 Author: Ira Cooper 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 Reviewed-by: Steve French Tested-by: Steve French --- Summary of changes: source3/modules/wscript_build | 1 + source3/wscript | 16 2 files changed, 13 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index 2d42a82..a5d8407 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -6,6 +6,7 @@ bld.SAMBA3_SUBSYSTEM('NFS4_ACLS', bld.SAMBA3_SUBSYSTEM('POSIXACL_XATTR', source='posixacl_xattr.c', + enabled=(bld.SAMBA3_IS_ENABLED_MODULE('vfs_ceph') or bld.SAMBA3_IS_ENABLED_MODULE('vfs_glusterfs')), deps='acl attr') bld.SAMBA3_LIBRARY('non_posix_acls', diff --git a/source3/wscript b/source3/wscript index 497b673..5ce1b77 100644 --- a/source3/wscript +++ b/source3/wscript @@ -69,6 +69,7 @@ def set_options(opt): action="store", dest='libcephfs_dir', default=None) opt.SAMBA3_ADD_OPTION('glusterfs', with_name="enable", without_name="disable", default=True) +opt.SAMBA3_ADD_OPTION('cephfs', with_name="enable", without_name="disable", default=True) opt.add_option('--enable-vxfs', help=("enable support for VxFS (default=no)"), @@ -1578,8 +1579,12 @@ main() { conf.env['CPPPATH_CEPHFS'] = Options.options.libcephfs_dir + '/include' conf.env['LIBPATH_CEPHFS'] = Options.options.libcephfs_dir + '/lib' -if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs'): -conf.DEFINE('HAVE_CEPH', '1') +if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs', shlib=True) and Options.options.with_cephfs: +if Options.options.with_acl_support: +conf.DEFINE('HAVE_CEPH', '1') +else: +Logs.warn("ceph support disabled due to --without-acl-support") +conf.undefine('HAVE_CEPH') if Options.options.with_glusterfs: conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 4" --cflags --libs', @@ -1588,9 +1593,12 @@ main() { conf.CHECK_LIB('gfapi', shlib=True) if conf.CONFIG_SET('HAVE_API_GLFS_H'): -conf.DEFINE('HAVE_GLUSTERFS', '1') +if Options.options.with_acl_support: + conf.DEFINE('HAVE_GLUSTERFS', '1') +else: +Logs.warn("GlusterFS support disabled due to --without-acl-support") +conf.undefine('HAVE_GLUSTERFS') else: -conf.SET_TARGET_TYPE('gfapi', 'EMPTY') conf.undefine('HAVE_GLUSTERFS') else: conf.SET_TARGET_TYPE('gfapi', 'EMPTY') -- Samba Shared Repository
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-1848/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-1848/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-1848/samba.stdout The top commit at the time of the failure was: commit 464b386d55b0c509b86645bdac7f6d3df489e902 Author: Martin SchwenkeDate: 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 Reviewed-by: Amitay Isaacs Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Mon Aug 8 11:30:58 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a0e60e9 samba-tool/ldapcmp: ignore differences of whenChanged via 7147859 smbd: ignore ctdb tombstone records in fetch_share_mode_unlocked_parser() from 464b386 ctdb-packaging: Stop RPM from renaming working config to ctdb.rpmsave https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a0e60e96aa38407ded8d63650dcf8f39304c958a Author: Stefan MetzmacherDate: Mon Aug 8 12:53:26 2016 +0200 samba-tool/ldapcmp: ignore differences of whenChanged This is implicitly replicated, but may diverge on updates of non-replicated attributes. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12129 Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Mon Aug 8 17:34:24 CEST 2016 on sn-devel-144 commit 7147859c7afc1344e76485e2cbc286679110d96e Author: Ralph Boehme 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 Reviewed-by: Stefan Metzmacher --- Summary of changes: python/samba/netcmd/ldapcmp.py| 2 +- source3/locking/share_mode_lock.c | 6 ++ 2 files changed, 7 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py index 96b94f2..cb02de2 100644 --- a/python/samba/netcmd/ldapcmp.py +++ b/python/samba/netcmd/ldapcmp.py @@ -438,7 +438,7 @@ class LDAPObject(object): "uSNChanged", "uSNCreated", "uSNLastObjRem", -# "whenChanged", # This is implicitly replicated +"whenChanged", # This is implicitly replicated, but may diverge on updates of non-replicated attributes ] self.ignore_attributes = self.non_replicated_attributes self.ignore_attributes += ["msExchServer1HighestUSN"] diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c index b5a63f8..f738323 100644 --- a/source3/locking/share_mode_lock.c +++ b/source3/locking/share_mode_lock.c @@ -628,6 +628,12 @@ static void fetch_share_mode_unlocked_parser( struct share_mode_lock *lck = talloc_get_type_abort( private_data, struct share_mode_lock); + if (data.dsize == 0) { + /* Likely a ctdb tombstone record, ignore it */ + lck->data = NULL; + return; + } + lck->data = parse_share_modes(lck, key, data); } -- Samba Shared Repository
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-1454/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-1454/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-1454/samba.stdout The top commit at the time of the failure was: commit 464b386d55b0c509b86645bdac7f6d3df489e902 Author: Martin SchwenkeDate: 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 Reviewed-by: Amitay Isaacs Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Mon Aug 8 11:30:58 CEST 2016 on sn-devel-144
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-08-08-1256/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-08-08-1256/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2016-08-08-1256/samba.stdout The top commit at the time of the failure was: commit 464b386d55b0c509b86645bdac7f6d3df489e902 Author: Martin SchwenkeDate: 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 Reviewed-by: Amitay Isaacs Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Mon Aug 8 11:30:58 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch v4-4-test updated
The branch, v4-4-test has been updated via f557672 ctdb-packaging: Move ctdb tests to libexec directory via ef3697f ctdb-waf: Move ctdb tests to libexec directory from ec4a00b man: Wrong option for parameter ldap ssl in smb.conf man page https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test - Log - commit f55767267ca89e5132005b86c0b8a503ffbf24f6 Author: Martin SchwenkeDate: 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 Reviewed-by: Andreas Schneider (cherry picked from commit 87c38d5d741f5e58f643ad4f797c523c67bbab00) Autobuild-User(v4-4-test): Karolin Seeger Autobuild-Date(v4-4-test): Mon Aug 8 12:45:56 CEST 2016 on sn-devel-144 commit ef3697fac98685304665a4f329906869b568de86 Author: Andreas Schneider 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 Reviewed-by: Martin Schwenke (cherry picked from commit f9c85d04e9edb3af9479e9c83d5b1ec77b9c2ee2) --- Summary of changes: ctdb/packaging/RPM/ctdb.spec.in | 4 ++-- ctdb/wscript| 20 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index 9d354ae..eed4a10 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -242,8 +242,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/wscript b/ctdb/wscript index 3633148..65db1a0 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -208,7 +208,7 @@ def configure(conf): conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX, 'share/ctdb-tests') -conf.env.CTDB_TEST_LIBDIR = os.path.join(conf.env.LIBDIR, 'ctdb-tests') +conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') # Allow unified compilation and separate compilation of utilities # to find includes @@ -637,12 +637,12 @@ def build(bld): bld.SAMBA_BINARY(target, source=src, deps='talloc tevent tdb tevent-util', - install_path='${CTDB_TEST_LIBDIR}') + install_path='${CTDB_TEST_LIBEXECDIR}') bld.SAMBA_BINARY('reqid_test', source='tests/src/reqid_test.c', deps='samba-util', - install_path='${CTDB_TEST_LIBDIR}') + install_path='${CTDB_TEST_LIBEXECDIR}') # Test binaries ctdb_tests = [ @@ -671,7 +671,7 @@ def build(bld): source=src, includes='include', deps='ctdb-client ctdb-common ctdb-util', - install_path='${CTDB_TEST_LIBDIR}') + install_path='${CTDB_TEST_LIBEXECDIR}') bld.SAMBA_BINARY('ctdb_takeover_tests', source='tests/src/ctdb_takeover_tests.c', @@ -680,21 +680,21 @@ def build(bld): ctdb-protocol''' + ib_deps, includes='include', - install_path='${CTDB_TEST_LIBDIR}') + install_path='${CTDB_TEST_LIBEXECDIR}') bld.SAMBA_BINARY('ctdb_functest', source='tests/src/ctdb_functest.c', deps='''replace tdb tevent talloc popt ctdb-system samba-util tdb-wrap''', includes='include', - install_path='${CTDB_TEST_LIBDIR}') + install_path='${CTDB_TEST_LIBEXECDIR}') bld.SAMBA_BINARY('ctdb_stubtest', source='tests/src/ctdb_test.c', deps='''replace tdb tevent talloc popt ctdb-system samba-util tdb-wrap''', includes='include', - install_path='${CTDB_TEST_LIBDIR}') + install_path='${CTDB_TEST_LIBEXECDIR}') if bld.env.HAVE_INFINIBAND: bld.SAMBA_BINARY('ibwrapper_test', @@ -702,7 +702,7 @@ def build(bld):
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 464b386 ctdb-packaging: Stop RPM from renaming working config to ctdb.rpmsave via d7ecc91 ctdb-daemon: Clean up SET_DB_PRIORITY/GET_DB_PRIORITY deprecation via 940272d ctdb-daemon: Fix CID 1125627 Resource leak (RESOURCE_LEAK) via b4f23a7 ctdb-common: Fix CID 1125585 Dereference after null check (FORWARD_NULL) via bbf0b90 ctdb-common: Fix CID 1125583 Dereference after null check (FORWARD_NULL) via 7ae3699 ctdb-common: Fix CID 1125581 Dereference after null check (FORWARD_NULL) via f802a11 ctdb-tests: Fix CID 1361816 Buffer not null terminated (BUFFER_SIZE_WARNING) via 4541301 ctdb-common: Fix CID 1363227 Resource leak (RESOURCE_LEAK) via 1f942ec ctdb-mutex: Avoid corner case where helper is already reparented to init via 88a5791 ctdb-tools: Use INVALID_GENERATION macro instead of value via 2295f50 ctdb-doc: Document that "ctdb tickle" can now read from stdin via f2b319e ctdb-tools: "ctdb tickle" command should run without daemon via 4d144d7 ctdb-tools: Cancel transaction on error or if commit fails via 8aa0003 ctdb-client: transaction_cancel must free transaction handle via 3c51ac4 ctdb-tools: Free temporary memory context before exiting via c9750c8 ctdb-tools: Close tdb database on error via 2e5e51e ctdb-tools: Free connection list after processing it via 1f6835c ctdb-tools: Add early return for empty connection list via b54bd76 ctdb-tools: Free tickle list before exiting via 814002c ctdb-tools: Free record if it does not contain valid data via bfe891e ctdb-tools: Fix CID 1364706 - resource leak via 5f5d954 ctdb-tools: Fix CID 1364705 - resource leak via 45b9c37 ctdb-tools: Fix CID 1364704 - resource leak via 94bf6e6 ctdb-tools: Fix CID 1364703 - resource leak via 10019f7 ctdb-tools: Fix CID 1364702 - resource leak via 25f27e1 ctdb-tools: Fix CID 1364701 - resource leak via bf1dab2 ctdb-tools: Fix CID 1364699 - dereference after null check via 049dd07 ctdb-tests: Add explicit wait to the fork_helper() via 8ce8e1d ctdb-tests: Clean up and rename simple transaction_loop recovery test via de04cd5 ctdb-tests: Clean up and rename simple transaction_loop test via 18b41fc ctdb-tests: Implement --interactive/-i option in transaction_loop via c10dcc7 ctdb-tests: Clean up and rename simple fetch_ring test via 82cffc2f ctdb-tests: Implement --interactive/-i option in fetch ring via e7a2203 ctdb-tests: Clean up and rename simple message_ring test via fbb3ef4 ctdb-tests: Implement --interactive/-i option in message_ring via b100d78 ctdb-tests: Add --interactive/-i option to test options parsing code from 1ddd01d s4: repl: Ensure all error paths in dreplsrv_op_pull_source_get_changes_trigger() are protected with tevent returns. https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 464b386d55b0c509b86645bdac7f6d3df489e902 Author: Martin SchwenkeDate: 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 Reviewed-by: Amitay Isaacs Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Mon Aug 8 11:30:58 CEST 2016 on sn-devel-144 commit d7ecc913bb40783c8cf8c66e3c3e99e6df414381 Author: Martin Schwenke 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 Reviewed-by: Amitay Isaacs commit 940272d215049f5f5079aa926e69eae1985a4bfa Author: Martin Schwenke 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 Reviewed-by: Amitay Isaacs commit b4f23a7e95cd9c8fc4a6324d4ec5a2881eaec207 Author: Martin Schwenke
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-1047/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-1047/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-08-08-1047/samba.stdout The top commit at the time of the failure was: commit 1ddd01dd21d5db9440dd382190e203c1e756fa3a Author: Jeremy AllisonDate: Thu Aug 4 11:09:21 2016 -0700 s4: repl: Ensure all error paths in dreplsrv_op_pull_source_get_changes_trigger() are protected with tevent returns. Otherwise dreplsrv_op_pull_source_get_changes_trigger() could infinitely recurse. Signed-off-by: Jeremy Allison Reviewed-by: Michael Adam Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Aug 6 01:24:05 CEST 2016 on sn-devel-144