[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 470af88 ctdb-tools: Fix heap-use-after-free problem
from 71cb574 libcli/smb: try to negotiate SMB2_ENCRYPTION_AES128_GCM
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 470af881479d1a1588dc23ef40622b4d8f006b61
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Oct 14 17:52:55 2014 +1100
ctdb-tools: Fix heap-use-after-free problem
Found by address sanitizer.
Signed-off-by: Amitay Isaacs ami...@gmail.com
Reviewed-by: Martin Schwenke mar...@meltin.net
Autobuild-User(master): Martin Schwenke mart...@samba.org
Autobuild-Date(master): Fri Oct 17 12:56:02 CEST 2014 on sn-devel-104
---
Summary of changes:
ctdb/tools/ctdb.c |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 71dfc28..c34e33d 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -896,6 +896,7 @@ static int find_node_xpnn(void)
TALLOC_CTX *mem_ctx = talloc_new(NULL);
struct pnn_node *pnn_nodes;
struct pnn_node *pnn_node;
+ int pnn;
pnn_nodes = read_nodes_file(mem_ctx);
if (pnn_nodes == NULL) {
@@ -906,8 +907,9 @@ static int find_node_xpnn(void)
for(pnn_node=pnn_nodes;pnn_node;pnn_node=pnn_node-next) {
if (ctdb_sys_have_ip(pnn_node-addr)) {
+ pnn = pnn_node-pnn;
talloc_free(mem_ctx);
- return pnn_node-pnn;
+ return pnn;
}
}
@@ -1818,6 +1820,7 @@ find_other_host_for_public_ip(struct ctdb_context *ctdb,
ctdb_sock_addr *addr)
struct ctdb_all_public_ips *ips;
struct ctdb_node_map *nodemap=NULL;
int i, j, ret;
+ int pnn;
ret = ctdb_ctrl_getnodemap(ctdb, TIMELIMIT(), CTDB_CURRENT_NODE,
tmp_ctx, nodemap);
if (ret != 0) {
@@ -1843,8 +1846,9 @@ find_other_host_for_public_ip(struct ctdb_context *ctdb,
ctdb_sock_addr *addr)
for (j=0;jips-num;j++) {
if (ctdb_same_ip(addr, ips-ips[j].addr)) {
+ pnn = nodemap-nodes[i].pnn;
talloc_free(tmp_ctx);
- return nodemap-nodes[i].pnn;
+ return pnn;
}
}
talloc_free(ips);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 14b5eb9 ntlm_auth: Allow the --option parameter to work against ntlm_auth via aee83c2 ntlm_auth: Allow us to use kerberos when we are an AD DC via 0f6ad53 docs: Explain that winbindd enforces smb signing by default. via bbad2fe s3:libsmb: remove unused cli_set_username() function via 0e2b255 s3:libsmb: avoid calling cli_set_username() cliconnect.c via 98f2946 s3:libsmb: avoid calling cli_set_username() in clidfs via 97759ec s3:libsmb: avoid cli_set_username() in SMBC_server_internal() via c8dca76 s3:lib/netapi: avoid calling cli_set_username() via 40bc651 s3:torture: avoid unused cli_set_username() via 71432b9 s3:libsmb: Remove unused domain copy stored in cli_state via 2b9d6d3 s3:libsmb: Remove unused password copy stored in cli_state via 07bd866 s3-winbindd: use cli_rpc_pipe_open_with_creds() via 295b323 s3-librpc: Add cli_rpc_pipe_open_with_creds() via be994ca s3-winbindd: Use own machine account to connect to trusted domains as well via 0392ebc s3-winbindd: use a cli_credentials structure to hold the trust credentials via e9472f8 libsmb: Print the principal name that we failed to kinit for. via 37f5d82 passdb: Use common code in cli_credentials_set_machine_account_db_ctx() via e9dc642 auth/credentials: Ensure that we set the realm when reading secrets.tdb via 35b8ed7 credentials: Allow the secret.tdb handle to be passed in to cli_credentials_set_machine_account() via 89daf5d credentials: Improve error message on failure to set machine account password via adb3eb7 credentials: Set secure_channel_type from secrets.tdb in cli_credentials_set_machine_account via 72687b1 selftest: Run samba.tests.messaging in an environment where it has servers to list via 022f1ca tests: Allow max open files to differ from the documentation from 470af88 ctdb-tools: Fix heap-use-after-free problem http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 14b5eb90d84f109f6a3ed8694acf13afe9b68f09 Author: Andrew Bartlett abart...@samba.org Date: Mon Oct 13 13:13:15 2014 +1300 ntlm_auth: Allow the --option parameter to work against ntlm_auth Change-Id: Iee386624359c2bf8437719f286e306cdfbb628c6 Signed-off-by: Andrew Bartlett abart...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Fri Oct 17 15:20:59 CEST 2014 on sn-devel-104 commit aee83c22ff65a7afd302c7a164259ad050634c39 Author: Andrew Bartlett abart...@samba.org Date: Mon Oct 13 09:42:25 2014 +1300 ntlm_auth: Allow us to use kerberos when we are an AD DC Change-Id: I88caff9ded915d914cb7fda8829ccbcd3ad64af1 Signed-off-by: Andrew Bartlett abart...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 0f6ad5370e0ed5201a63e047b7e3fef5b27b3149 Author: Andrew Bartlett abart...@samba.org Date: Wed Oct 1 20:49:23 2014 +1300 docs: Explain that winbindd enforces smb signing by default. Change-Id: I9341fa3bd7480836ac5e0c18e28458175b42d44a Signed-off-by: Andrew Bartlett abart...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit bbad2fed7cda09f5a7d7006ada6382d29f1c1a86 Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 26 03:39:13 2014 +0200 s3:libsmb: remove unused cli_set_username() function Change-Id: Ib432b4ff66f966de9e733e01de6de2f486c0c728 Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 0e2b25562241404db70d0bba018998078361976d Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 26 03:35:30 2014 +0200 s3:libsmb: avoid calling cli_set_username() cliconnect.c Change-Id: I45e44405ea51ecb1aa38c72f4fc6243a1d3d531a Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 98f2946dd1deea558cc41df93c2109754838eae1 Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 26 03:33:45 2014 +0200 s3:libsmb: avoid calling cli_set_username() in clidfs Change-Id: I8b32be8a10d2bff33bb468cc68c98e555b220bde Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 97759ecfaea36555db78a6854355c02acd15053b Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 26 03:17:08 2014 +0200 s3:libsmb: avoid cli_set_username() in SMBC_server_internal() Change-Id: I32e19078a4d4948e405f39dc2a479ff925ad3684 Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit c8dca765a0c984602389bbd707eca7c58cd41b41 Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 26 03:14:53 2014 +0200
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f3841b9 selftest: add documentation for options --exclude and
--include that weren't documented before
via bdfcee6 selftest: report the 10 slowest tests (by default) make the
number configurable
via 4055eb6 scripts: Allow to specify a limit on the number of tests
reported
from 14b5eb9 ntlm_auth: Allow the --option parameter to work against
ntlm_auth
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f3841b9a0fa6c9eff9f1245b91c5210bd7d533ae
Author: Matthieu Patou m...@matws.net
Date: Sun Oct 12 20:59:02 2014 -0700
selftest: add documentation for options --exclude and --include that
weren't documented before
Change-Id: Ibf0fa1c548d376dc8d68ab8136e2532f67dd1d8a
Signed-off-by: Matthieu Patou m...@matws.net
Reviewed-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Fri Oct 17 20:20:12 CEST 2014 on sn-devel-104
commit bdfcee6b8e457b8f5ecd0931e4cfb0473e4d78b3
Author: Matthieu Patou m...@matws.net
Date: Sun Oct 12 17:57:20 2014 -0700
selftest: report the 10 slowest tests (by default) make the number
configurable
Change-Id: Ib1cf50199d110827a25cf198b40738f3c72cbe17
Signed-off-by: Matthieu Patou m...@matws.net
Reviewed-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
commit 4055eb6b7dbd845cfc431a2cf7f1867240046fdf
Author: Matthieu Patou m...@matws.net
Date: Sun Oct 12 17:56:10 2014 -0700
scripts: Allow to specify a limit on the number of tests reported
This allows to report the 10 most slowest for instance.
Change-Id: I987520dbc28f598221c47df314d823f916312aab
Signed-off-by: Matthieu Patou m...@matws.net
Reviewed-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
---
Summary of changes:
script/show_testsuite_time | 10 --
selftest/selftest.pl |2 ++
selftest/wscript | 10 ++
3 files changed, 20 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/script/show_testsuite_time b/script/show_testsuite_time
index 4015321..13ae0b6 100755
--- a/script/show_testsuite_time
+++ b/script/show_testsuite_time
@@ -9,11 +9,16 @@ my $start=0;
my $end=0;
my %hash;
my $fh;
+my $max=0;
if ($#ARGV = 0) {
open($fh, , $ARGV[0]) || die can't open .$ARGV[0];
} else {
$fh = $in;
}
+if ($#ARGV = 1) {
+ $max = $ARGV[1];
+}
+
while($fh)
{
if (m/^testsuite: (.*)/) {
@@ -34,7 +39,8 @@ while($fh)
}
}
}
-my @sorted = sort { $hash{$a}=$hash{$b} } keys(%hash);
-for my $l (@sorted) {
+my @sorted = sort { $hash{$b}=$hash{$a} } keys(%hash);
+$max = $#sorted unless $max or ($max $#sorted);
+for my $l (@sorted[0..($max - 1)]) {
print $l.\n;
}
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 2df5092..7dde5b2 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -190,6 +190,8 @@ Generic options:
--help this help page
--target=samba[3]|win Samba version to target
--testlist=FILEfile to read available tests from
+ --exclude=FILE Exclude tests listed in the file
+ --include=FILE Include tests listed in the file
Paths:
--prefix=DIR prefix to run tests in [st]
diff --git a/selftest/wscript b/selftest/wscript
index 7c6d3d7..e5df412 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -45,6 +45,9 @@ def set_options(opt):
gr.add_option('--slow',
help=(enable the really slow tests),
action=store_true, dest='SLOWTEST', default=False)
+gr.add_option('--nb-slowest',
+ help=(Show the n slowest tests (default=10)),
+ type=int, default=10, dest='NB_SLOWEST')
gr.add_option('--testenv',
help=(start a terminal with the test environment setup),
action=store_true, dest='TESTENV', default=False)
@@ -232,6 +235,13 @@ def cmd_testonly(opt):
runcmd = EXPAND_VARIABLES(opt, testrcmd)
RUN_COMMAND(runcmd, env=env)
+if os.path.exists(st/subunit):
+nb = Options.options.NB_SLOWEST
+print TOP %d slowest tests % nb
+cmd = ./script/show_testsuite_time %s/subunit %d %
(Options.options.SELFTEST_PREFIX, nb)
+runcmd = EXPAND_VARIABLES(opt, cmd)
+RUN_COMMAND(runcmd, env=env)
+
if ret != 0:
print(ERROR: test failed with exit code %d % ret)
sys.exit(ret)
--
Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system 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/2014-10-17-2251/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-10-17-2251/samba.stderr http://git.samba.org/autobuild.flakey/2014-10-17-2251/samba.stdout The top commit at the time of the failure was: commit f3841b9a0fa6c9eff9f1245b91c5210bd7d533ae Author: Matthieu Patou m...@matws.net Date: Sun Oct 12 20:59:02 2014 -0700 selftest: add documentation for options --exclude and --include that weren't documented before Change-Id: Ibf0fa1c548d376dc8d68ab8136e2532f67dd1d8a Signed-off-by: Matthieu Patou m...@matws.net Reviewed-by: Jelmer Vernooij jel...@samba.org Reviewed-by: Michael Adam ob...@samba.org Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Fri Oct 17 20:20:12 CEST 2014 on sn-devel-104
