The branch, master has been updated
via bb5c394 s3:smb2_sesssetup: allow a compound request after a
SessionSetup
via f8974bc s3:smb2_tcon: allow a compound request after a TreeConnect
via bd31d53 s3: libsmb: Correctly save and restore connection tcon in
smbclient, smbcacls and smbtorture3.
via 50f5025 s3: libsmb: Correctly do lifecycle management on
cli->smb1.tcon and cli->smb2.tcon.
via c9178ed s3: libsmb: Fix cli_state_has_tcon() to cope with SMB2
connections.
via 93fa0c8 s3: libsmb: Widen cli_state_get_tid() / cli_state_set_tid()
to 32-bits.
via 5c0efc9 s3: smbtorture: Show correct use of cli_state_save_tcon() /
cli_state_restore_tcon().
via 39026f1 s3: libsmb: Add cli_state_save_tcon() /
cli_state_restore_tcon().
via e726b60 libcli: smb: Add smb2cli_tcon_set_id().
via 655e106 libcli: smb: Add smbXcli_tcon_copy().
from 60cae0a dsdb: Add comment explaining requirements on
DSDB_EXTENDED_SCHEMA_UPDATE_NOW_OID
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bb5c394fde03dc8230d5089a66fea1a2541952f5
Author: Stefan Metzmacher <[email protected]>
Date: Thu Jun 15 23:01:18 2017 +0200
s3:smb2_sesssetup: allow a compound request after a SessionSetup
This is not a full fix yet as we don't allow compound requests
after going async.
With SMB 3.11 requiring signed TreeConnect requests it's pointless
to try to compound requests after a SessionSetup.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12845
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Sat Jun 17 10:55:25 CEST 2017 on sn-devel-144
commit f8974bcdbf8abe3803340dcd20206ff4de9d5079
Author: Stefan Metzmacher <[email protected]>
Date: Thu Jun 15 23:01:18 2017 +0200
s3:smb2_tcon: allow a compound request after a TreeConnect
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12844
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit bd31d538a26bb21cbb53986a6105204da4392e2d
Author: Jeremy Allison <[email protected]>
Date: Tue Jun 13 16:56:48 2017 -0700
s3: libsmb: Correctly save and restore connection tcon in smbclient,
smbcacls and smbtorture3.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12831
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
commit 50f50256aa8805921c42d0f9f2f8f89d06d9bd93
Author: Jeremy Allison <[email protected]>
Date: Tue Jun 13 16:37:39 2017 -0700
s3: libsmb: Correctly do lifecycle management on cli->smb1.tcon and
cli->smb2.tcon.
Treat them identically. Create them on demand after for a tcon call,
and delete them on a tdis call.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12831
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
commit c9178ed9cc69b9089292db28ac1a0b7a0519bc2c
Author: Jeremy Allison <[email protected]>
Date: Tue Jun 13 16:36:54 2017 -0700
s3: libsmb: Fix cli_state_has_tcon() to cope with SMB2 connections.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12831
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
commit 93fa0c8660e47cb2605d70dac1156576ab719d64
Author: Jeremy Allison <[email protected]>
Date: Tue Jun 13 16:26:00 2017 -0700
s3: libsmb: Widen cli_state_get_tid() / cli_state_set_tid() to 32-bits.
Copes with SMB2 connections.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12831
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
commit 5c0efc9a5ef8ddf96dc394110063bebd5f057415
Author: Jeremy Allison <[email protected]>
Date: Tue Jun 13 16:25:25 2017 -0700
s3: smbtorture: Show correct use of cli_state_save_tcon() /
cli_state_restore_tcon().
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12831
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
commit 39026f1c5dbb83120b70b3d9131138a9c2344ba6
Author: Jeremy Allison <[email protected]>
Date: Tue Jun 13 16:15:00 2017 -0700
s3: libsmb: Add cli_state_save_tcon() / cli_state_restore_tcon().
Save and restore tcon pointers in smb1 or smb2 structs.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12831
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
commit e726b60226105d0f52a66dac47bfc5797cfc18e7
Author: Jeremy Allison <[email protected]>
Date: Tue Jun 13 16:08:22 2017 -0700
libcli: smb: Add smb2cli_tcon_set_id().
Will be used in test and client code.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12831
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
commit 655e10685840fd5ebfde24396853b74020a1dc85
Author: Jeremy Allison <[email protected]>
Date: Tue Jun 13 16:06:22 2017 -0700
libcli: smb: Add smbXcli_tcon_copy().
Makes a deep copy of a struct smbXcli_tcon *, will
be used later.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12831
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
libcli/smb/smbXcli_base.c | 37 ++++++++++++++++++++++++
libcli/smb/smbXcli_base.h | 3 ++
source3/client/client.c | 5 +++-
source3/lib/util_sd.c | 24 +++++++++++++---
source3/libsmb/cliconnect.c | 23 +++++++++++++--
source3/libsmb/clidfs.c | 18 +++++++++---
source3/libsmb/clientgen.c | 67 +++++++++++++++++++++++++++++++++----------
source3/libsmb/proto.h | 7 +++--
source3/smbd/smb2_sesssetup.c | 1 +
source3/smbd/smb2_tcon.c | 2 ++
source3/torture/test_smb2.c | 8 ++++--
source3/torture/torture.c | 24 +++++++++++++---
source3/utils/net_rpc.c | 12 ++++++--
source3/utils/smbcacls.c | 12 ++++++--
14 files changed, 203 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 74a602d..cc89789 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -6114,6 +6114,38 @@ struct smbXcli_tcon *smbXcli_tcon_create(TALLOC_CTX
*mem_ctx)
return tcon;
}
+/*
+ * Return a deep structure copy of a struct smbXcli_tcon *
+ */
+
+struct smbXcli_tcon *smbXcli_tcon_copy(TALLOC_CTX *mem_ctx,
+ const struct smbXcli_tcon *tcon_in)
+{
+ struct smbXcli_tcon *tcon;
+
+ tcon = talloc_memdup(mem_ctx, tcon_in, sizeof(struct smbXcli_tcon));
+ if (tcon == NULL) {
+ return NULL;
+ }
+
+ /* Deal with the SMB1 strings. */
+ if (tcon_in->smb1.service != NULL) {
+ tcon->smb1.service = talloc_strdup(tcon, tcon_in->smb1.service);
+ if (tcon->smb1.service == NULL) {
+ TALLOC_FREE(tcon);
+ return NULL;
+ }
+ }
+ if (tcon->smb1.fs_type != NULL) {
+ tcon->smb1.fs_type = talloc_strdup(tcon, tcon_in->smb1.fs_type);
+ if (tcon->smb1.fs_type == NULL) {
+ TALLOC_FREE(tcon);
+ return NULL;
+ }
+ }
+ return tcon;
+}
+
void smbXcli_tcon_set_fs_attributes(struct smbXcli_tcon *tcon,
uint32_t fs_attributes)
{
@@ -6192,6 +6224,11 @@ uint32_t smb2cli_tcon_current_id(struct smbXcli_tcon
*tcon)
return tcon->smb2.tcon_id;
}
+void smb2cli_tcon_set_id(struct smbXcli_tcon *tcon, uint32_t tcon_id)
+{
+ tcon->smb2.tcon_id = tcon_id;
+}
+
uint32_t smb2cli_tcon_capabilities(struct smbXcli_tcon *tcon)
{
return tcon->smb2.capabilities;
diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 1abeb2b..52fec9a 100644
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -501,6 +501,8 @@ NTSTATUS smb2cli_session_set_channel_key(struct
smbXcli_session *session,
NTSTATUS smb2cli_session_encryption_on(struct smbXcli_session *session);
struct smbXcli_tcon *smbXcli_tcon_create(TALLOC_CTX *mem_ctx);
+struct smbXcli_tcon *smbXcli_tcon_copy(TALLOC_CTX *mem_ctx,
+ const struct smbXcli_tcon *tcon_in);
void smbXcli_tcon_set_fs_attributes(struct smbXcli_tcon *tcon,
uint32_t fs_attributes);
uint32_t smbXcli_tcon_get_fs_attributes(struct smbXcli_tcon *tcon);
@@ -515,6 +517,7 @@ bool smb1cli_tcon_set_values(struct smbXcli_tcon *tcon,
const char *service,
const char *fs_type);
uint32_t smb2cli_tcon_current_id(struct smbXcli_tcon *tcon);
+void smb2cli_tcon_set_id(struct smbXcli_tcon *tcon, uint32_t tcon_id);
uint32_t smb2cli_tcon_capabilities(struct smbXcli_tcon *tcon);
uint32_t smb2cli_tcon_flags(struct smbXcli_tcon *tcon);
void smb2cli_tcon_set_values(struct smbXcli_tcon *tcon,
diff --git a/source3/client/client.c b/source3/client/client.c
index 6464736..3285240 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4712,7 +4712,10 @@ static int cmd_tid(void)
d_printf("no tcon currently\n");
}
} else {
- uint16_t tid = atoi(tid_str);
+ uint32_t tid = atoi(tid_str);
+ if (!cli_state_has_tcon(cli)) {
+ d_printf("no tcon currently\n");
+ }
cli_state_set_tid(cli, tid);
}
diff --git a/source3/lib/util_sd.c b/source3/lib/util_sd.c
index d79fe79..aa6d4809 100644
--- a/source3/lib/util_sd.c
+++ b/source3/lib/util_sd.c
@@ -84,7 +84,7 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
enum lsa_SidType *type,
char **domain, char **name)
{
- uint16_t orig_cnum = cli_state_get_tid(cli);
+ struct smbXcli_tcon *orig_tcon = NULL;
struct rpc_pipe_client *p = NULL;
struct policy_handle handle;
NTSTATUS status;
@@ -93,6 +93,14 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
char **domains;
char **names;
+ if (cli_state_has_tcon(cli)) {
+ orig_tcon = cli_state_save_tcon(cli);
+ if (orig_tcon == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ goto tcon_fail;
+ }
+ }
+
status = cli_tree_connect(cli, "IPC$", "?????", NULL);
if (!NT_STATUS_IS_OK(status)) {
goto tcon_fail;
@@ -125,7 +133,7 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
TALLOC_FREE(p);
cli_tdis(cli);
tcon_fail:
- cli_state_set_tid(cli, orig_cnum);
+ cli_state_restore_tcon(cli, orig_tcon);
TALLOC_FREE(frame);
return status;
}
@@ -165,7 +173,7 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
enum lsa_SidType *type,
struct dom_sid *sid)
{
- uint16_t orig_cnum = cli_state_get_tid(cli);
+ struct smbXcli_tcon *orig_tcon = NULL;
struct rpc_pipe_client *p;
struct policy_handle handle;
NTSTATUS status;
@@ -173,6 +181,14 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
struct dom_sid *sids;
enum lsa_SidType *types;
+ if (cli_state_has_tcon(cli)) {
+ orig_tcon = cli_state_save_tcon(cli);
+ if (orig_tcon == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ goto tcon_fail;
+ }
+ }
+
status = cli_tree_connect(cli, "IPC$", "?????", NULL);
if (!NT_STATUS_IS_OK(status)) {
goto tcon_fail;
@@ -204,7 +220,7 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
TALLOC_FREE(p);
cli_tdis(cli);
tcon_fail:
- cli_state_set_tid(cli, orig_cnum);
+ cli_state_restore_tcon(cli, orig_tcon);
TALLOC_FREE(frame);
return status;
}
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 200657a..3fa80a2 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1948,6 +1948,13 @@ struct tevent_req *cli_tcon_andx_create(TALLOC_CTX
*mem_ctx,
state->cli = cli;
vwv = state->vwv;
+ TALLOC_FREE(cli->smb1.tcon);
+ cli->smb1.tcon = smbXcli_tcon_create(cli);
+ if (tevent_req_nomem(cli->smb1.tcon, req)) {
+ return tevent_req_post(req, ev);
+ }
+ smb1cli_tcon_set_id(cli->smb1.tcon, UINT16_MAX);
+
cli->share = talloc_strdup(cli, share);
if (!cli->share) {
return NULL;
@@ -2257,6 +2264,7 @@ static struct tevent_req *cli_tree_connect_send(
if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
char *unc;
+ TALLOC_FREE(cli->smb2.tcon);
cli->smb2.tcon = smbXcli_tcon_create(cli);
if (tevent_req_nomem(cli->smb2.tcon, req)) {
return tevent_req_post(req, ev);
@@ -2429,7 +2437,7 @@ static void cli_tdis_done(struct tevent_req *subreq)
tevent_req_nterror(req, status);
return;
}
- cli_state_set_tid(state->cli, UINT16_MAX);
+ TALLOC_FREE(state->cli->smb1.tcon);
tevent_req_done(req);
}
@@ -2445,10 +2453,14 @@ NTSTATUS cli_tdis(struct cli_state *cli)
NTSTATUS status = NT_STATUS_NO_MEMORY;
if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
- return smb2cli_tdis(cli->conn,
+ status = smb2cli_tdis(cli->conn,
cli->timeout,
cli->smb2.session,
cli->smb2.tcon);
+ if (NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(cli->smb2.tcon);
+ }
+ return status;
}
if (smbXcli_conn_has_async_calls(cli->conn)) {
@@ -3623,6 +3635,13 @@ static struct tevent_req *cli_raw_tcon_send(
return tevent_req_post(req, ev);
}
+ TALLOC_FREE(cli->smb1.tcon);
+ cli->smb1.tcon = smbXcli_tcon_create(cli);
+ if (tevent_req_nomem(cli->smb1.tcon, req)) {
+ return tevent_req_post(req, ev);
+ }
+ smb1cli_tcon_set_id(cli->smb1.tcon, UINT16_MAX);
+
bytes = talloc_array(state, uint8_t, 0);
bytes = smb_bytes_push_bytes(bytes, 4, NULL, 0);
bytes = smb_bytes_push_str(bytes, smbXcli_conn_use_unicode(cli->conn),
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index c477d7c..75012b2 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -1205,7 +1205,7 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
size_t consumed = 0;
char *fullpath = NULL;
bool res;
- uint16_t cnum;
+ struct smbXcli_tcon *orig_tcon = NULL;
char *newextrapath = NULL;
NTSTATUS status;
const char *remote_name;
@@ -1215,7 +1215,6 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
}
remote_name = smbXcli_conn_remote_name(cli->conn);
- cnum = cli_state_get_tid(cli);
/* special case. never check for a referral on the IPC$ share */
@@ -1230,15 +1229,25 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
return false;
}
+ /* Store tcon state. */
+ if (cli_state_has_tcon(cli)) {
+ orig_tcon = cli_state_save_tcon(cli);
+ if (orig_tcon == NULL) {
+ return false;
+ }
+ }
+
/* check for the referral */
if (!NT_STATUS_IS_OK(cli_tree_connect(cli, "IPC$", "IPC", NULL))) {
+ cli_state_restore_tcon(cli, orig_tcon);
return false;
}
if (force_encrypt) {
status = cli_cm_force_encryption_creds(cli, creds, "IPC$");
if (!NT_STATUS_IS_OK(status)) {
+ cli_state_restore_tcon(cli, orig_tcon);
return false;
}
}
@@ -1248,12 +1257,13 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
res = NT_STATUS_IS_OK(status);
status = cli_tdis(cli);
+
+ cli_state_restore_tcon(cli, orig_tcon);
+
if (!NT_STATUS_IS_OK(status)) {
return false;
}
- cli_state_set_tid(cli, cnum);
-
if (!res || !num_refs) {
return false;
}
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index bc5c1b1..2b53a93 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -227,11 +227,6 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
cli->smb1.pid = (uint32_t)getpid();
cli->smb1.vc_num = cli->smb1.pid;
- cli->smb1.tcon = smbXcli_tcon_create(cli);
- if (cli->smb1.tcon == NULL) {
- goto error;
- }
- smb1cli_tcon_set_id(cli->smb1.tcon, UINT16_MAX);
cli->smb1.session = smbXcli_session_create(cli, cli->conn);
if (cli->smb1.session == NULL) {
goto error;
@@ -341,27 +336,69 @@ uint32_t cli_getpid(struct cli_state *cli)
bool cli_state_has_tcon(struct cli_state *cli)
{
- uint16_t tid = cli_state_get_tid(cli);
-
- if (tid == UINT16_MAX) {
- return false;
+ uint32_t tid;
+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+ if (cli->smb2.tcon == NULL) {
+ return false;
+ }
+ tid = cli_state_get_tid(cli);
+ if (tid == UINT32_MAX) {
+ return false;
+ }
+ } else {
+ if (cli->smb1.tcon == NULL) {
+ return false;
+ }
+ tid = cli_state_get_tid(cli);
+ if (tid == UINT16_MAX) {
+ return false;
+ }
}
-
return true;
}
-uint16_t cli_state_get_tid(struct cli_state *cli)
+uint32_t cli_state_get_tid(struct cli_state *cli)
{
- return smb1cli_tcon_current_id(cli->smb1.tcon);
+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+ return smb2cli_tcon_current_id(cli->smb2.tcon);
+ } else {
+ return (uint32_t)smb1cli_tcon_current_id(cli->smb1.tcon);
+ }
}
-uint16_t cli_state_set_tid(struct cli_state *cli, uint16_t tid)
+uint32_t cli_state_set_tid(struct cli_state *cli, uint32_t tid)
{
- uint16_t ret = smb1cli_tcon_current_id(cli->smb1.tcon);
- smb1cli_tcon_set_id(cli->smb1.tcon, tid);
+ uint32_t ret;
+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+ ret = smb2cli_tcon_current_id(cli->smb2.tcon);
+ smb2cli_tcon_set_id(cli->smb1.tcon, tid);
+ } else {
+ ret = smb1cli_tcon_current_id(cli->smb1.tcon);
+ smb1cli_tcon_set_id(cli->smb1.tcon, tid);
+ }
return ret;
}
+struct smbXcli_tcon *cli_state_save_tcon(struct cli_state *cli)
+{
+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+ return smbXcli_tcon_copy(cli, cli->smb2.tcon);
+ } else {
+ return smbXcli_tcon_copy(cli, cli->smb1.tcon);
+ }
+}
+
+void cli_state_restore_tcon(struct cli_state *cli, struct smbXcli_tcon *tcon)
+{
+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+ TALLOC_FREE(cli->smb2.tcon);
+ cli->smb2.tcon = tcon;
+ } else {
+ TALLOC_FREE(cli->smb1.tcon);
+ cli->smb1.tcon = tcon;
+ }
+}
+
uint16_t cli_state_get_uid(struct cli_state *cli)
{
return smb1cli_session_current_id(cli->smb1.session);
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 137c355..6728c97 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -194,8 +194,11 @@ uint16_t cli_state_get_vc_num(struct cli_state *cli);
uint32_t cli_setpid(struct cli_state *cli, uint32_t pid);
uint32_t cli_getpid(struct cli_state *cli);
bool cli_state_has_tcon(struct cli_state *cli);
-uint16_t cli_state_get_tid(struct cli_state *cli);
-uint16_t cli_state_set_tid(struct cli_state *cli, uint16_t tid);
+uint32_t cli_state_get_tid(struct cli_state *cli);
+uint32_t cli_state_set_tid(struct cli_state *cli, uint32_t tid);
+struct smbXcli_tcon;
+struct smbXcli_tcon *cli_state_save_tcon(struct cli_state *cli);
+void cli_state_restore_tcon(struct cli_state *cli, struct smbXcli_tcon *tcon);
uint16_t cli_state_get_uid(struct cli_state *cli);
uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid);
bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive);
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 53cd7de..eda538f 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -483,6 +483,7 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct
smbXsrv_session *session,
global_client_caps |= (CAP_LEVEL_II_OPLOCKS|CAP_STATUS32);
*out_session_id = session->global->session_wire_id;
+ smb2req->last_session_id = session->global->session_wire_id;
return NT_STATUS_OK;
}
diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index 5330fc3..914eb87 100644
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -381,6 +381,8 @@ static NTSTATUS smbd_smb2_tree_connect(struct
smbd_smb2_request *req,
*out_maximal_access = tcon->compat->share_access;
*out_tree_id = tcon->global->tcon_wire_id;
+ req->last_tid = tcon->global->tcon_wire_id;
+
return NT_STATUS_OK;
}
diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index c0d11e6..9368ab3 100644
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -170,7 +170,10 @@ bool run_smb2_basic(int dummy)
}
saved_tid = smb2cli_tcon_current_id(cli->smb2.tcon);
- saved_tcon = cli->smb2.tcon;
+ saved_tcon = cli_state_save_tcon(cli);
+ if (saved_tcon == NULL) {
+ return false;
+ }
cli->smb2.tcon = smbXcli_tcon_create(cli);
smb2cli_tcon_set_values(cli->smb2.tcon,
NULL, /* session */
@@ -187,8 +190,7 @@ bool run_smb2_basic(int dummy)
printf("smb2cli_tdis returned %s\n", nt_errstr(status));
return false;
}
- talloc_free(cli->smb2.tcon);
- cli->smb2.tcon = saved_tcon;
+ cli_state_restore_tcon(cli, saved_tcon);
status = smb2cli_tdis(cli->conn,
cli->timeout,
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 2d4b62d..6b6dbdf 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -1301,7 +1301,8 @@ static bool run_tcon_test(int dummy)
static struct cli_state *cli;
const char *fname = "\\tcontest.tmp";
uint16_t fnum1;
- uint16_t cnum1, cnum2, cnum3;
+ uint32_t cnum1, cnum2, cnum3;
+ struct smbXcli_tcon *orig_tcon = NULL;
uint16_t vuid1, vuid2;
char buf[4];
bool ret = True;
@@ -1333,6 +1334,11 @@ static bool run_tcon_test(int dummy)
return False;
}
+ orig_tcon = cli_state_save_tcon(cli);
+ if (orig_tcon == NULL) {
+ return false;
+ }
+
status = cli_tree_connect_creds(cli, share, "?????", torture_creds);
if (!NT_STATUS_IS_OK(status)) {
printf("%s refused 2nd tree connect (%s)\n", host,
@@ -1400,6 +1406,8 @@ static bool run_tcon_test(int dummy)
return False;
}
+ cli_state_restore_tcon(cli, orig_tcon);
+
cli_state_set_tid(cli, cnum1);
if (!torture_close_connection(cli)) {
@@ -2764,8 +2772,8 @@ static bool run_fdsesstest(int dummy)
struct cli_state *cli;
uint16_t new_vuid;
uint16_t saved_vuid;
- uint16_t new_cnum;
- uint16_t saved_cnum;
+ uint32_t new_cnum;
+ uint32_t saved_cnum;
const char *fname = "\\fdsess.tst";
const char *fname1 = "\\fdsess1.tst";
--
Samba Shared Repository
