The branch, master has been updated
via f24567e torture:smb2: skip replay4 if server does not support
multi-channel
via 0426519 smbd: fix crash in smbXsrv_client_global_remove()
from a5f441d vfs:zfs fix build after get_nt_acl_fn signature change.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f24567e9fd6ad5925691df2ebc23cfd8a127c5a8
Author: Michael Adam <ob...@samba.org>
Date: Tue Mar 1 23:07:06 2016 +0100
torture:smb2: skip replay4 if server does not support multi-channel
Signed-off-by: Michael Adam <ob...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
Autobuild-User(master): Michael Adam <ob...@samba.org>
Autobuild-Date(master): Wed Mar 2 20:38:49 CET 2016 on sn-devel-144
commit 04265199b389a7b38c3047985da68e8442a0b746
Author: Michael Adam <ob...@samba.org>
Date: Tue Mar 1 20:40:47 2016 +0100
smbd: fix crash in smbXsrv_client_global_remove()
Probably copy-n-paste error.
Uncovered by the multi-channel-related tests we're
currently writing to exercise this code more.
Pair-Programmed-With: Guenther Deschner <g...@samba.org>
Signed-off-by: Michael Adam <ob...@samba.org>
Signed-off-by: Guenther Deschner <g...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/smbXsrv_client.c | 8 ++------
source4/torture/smb2/replay.c | 8 ++++++++
2 files changed, 10 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smbXsrv_client.c b/source3/smbd/smbXsrv_client.c
index 2dd4cad..d8ba2f7 100644
--- a/source3/smbd/smbXsrv_client.c
+++ b/source3/smbd/smbXsrv_client.c
@@ -428,7 +428,6 @@ static NTSTATUS smbXsrv_client_global_store(struct
smbXsrv_client_global0 *globa
static NTSTATUS smbXsrv_client_global_remove(struct smbXsrv_client_global0
*global)
{
- struct smbXsrv_client_globalB global_blob;
TDB_DATA key;
NTSTATUS status;
@@ -453,11 +452,8 @@ static NTSTATUS smbXsrv_client_global_remove(struct
smbXsrv_client_global0 *glob
return status;
}
global->stored = false;
- if (DEBUGLVL(DBGLVL_DEBUG)) {
- DBG_DEBUG("key '%s' delete\n",
- hex_encode_talloc(global->db_rec, key.dptr, key.dsize));
- NDR_PRINT_DEBUG(smbXsrv_client_globalB, &global_blob);
- }
+ DBG_DEBUG("key '%s' delete\n",
+ hex_encode_talloc(global->db_rec, key.dptr, key.dsize));
TALLOC_FREE(global->db_rec);
diff --git a/source4/torture/smb2/replay.c b/source4/torture/smb2/replay.c
index 26c32d1..21f6f80 100644
--- a/source4/torture/smb2/replay.c
+++ b/source4/torture/smb2/replay.c
@@ -650,12 +650,20 @@ static bool test_replay4(struct torture_context *tctx,
struct smb2_tree *tree1)
uint16_t curr_cs;
uint32_t share_capabilities;
bool share_is_so;
+ uint32_t server_capabilities;
if (smbXcli_conn_protocol(transport1->conn) < PROTOCOL_SMB3_00) {
torture_skip(tctx, "SMB 3.X Dialect family required for "
"Replay tests\n");
}
+ server_capabilities = smb2cli_conn_server_capabilities(
+ tree1->session->transport->conn);
+ if (!(server_capabilities & SMB2_CAP_MULTI_CHANNEL)) {
+ torture_skip(tctx,
+ "Server does not support multi-channel.");
+ }
+
share_capabilities = smb2cli_tcon_capabilities(tree1->smbXcli);
share_is_so = share_capabilities & SMB2_SHARE_CAP_SCALEOUT;
--
Samba Shared Repository
