diff options
| -rw-r--r-- | libcli/smb/smbXcli_base.c | 1 | ||||
| -rw-r--r-- | libcli/smb/smbXcli_base.h | 1 | ||||
| -rw-r--r-- | source3/libsmb/smb2cli_tcon.c | 1 | ||||
| -rw-r--r-- | source3/torture/test_smb2.c | 4 | ||||
| -rw-r--r-- | source4/libcli/smb2/connect.c | 1 | ||||
| -rw-r--r-- | source4/torture/smb2/compound.c | 3 | ||||
| -rw-r--r-- | source4/torture/smb2/notify.c | 1 | ||||
| -rw-r--r-- | source4/torture/smb2/util.c | 1 |
8 files changed, 13 insertions, 0 deletions
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index 275dfed32c..9e00ba9cab 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -4624,6 +4624,7 @@ uint32_t smb2cli_tcon_capabilities(struct smbXcli_tcon *tcon) } void smb2cli_tcon_set_values(struct smbXcli_tcon *tcon, + struct smbXcli_session *session, uint32_t tcon_id, uint8_t type, uint32_t flags, diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index 5c524b0ec8..804fe4428a 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -284,6 +284,7 @@ bool smb1cli_tcon_set_values(struct smbXcli_tcon *tcon, uint32_t smb2cli_tcon_current_id(struct smbXcli_tcon *tcon); uint32_t smb2cli_tcon_capabilities(struct smbXcli_tcon *tcon); void smb2cli_tcon_set_values(struct smbXcli_tcon *tcon, + struct smbXcli_session *session, uint32_t tcon_id, uint8_t type, uint32_t flags, diff --git a/source3/libsmb/smb2cli_tcon.c b/source3/libsmb/smb2cli_tcon.c index 2a37088885..ca44311f5c 100644 --- a/source3/libsmb/smb2cli_tcon.c +++ b/source3/libsmb/smb2cli_tcon.c @@ -139,6 +139,7 @@ static void smb2cli_tcon_done(struct tevent_req *subreq) } smb2cli_tcon_set_values(cli->smb2.tcon, + cli->smb2.session, tcon_id, share_type, share_flags, diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c index d46ecf065e..79ffef1958 100644 --- a/source3/torture/test_smb2.c +++ b/source3/torture/test_smb2.c @@ -172,6 +172,7 @@ bool run_smb2_basic(int dummy) saved_tcon = cli->smb2.tcon; cli->smb2.tcon = smbXcli_tcon_create(cli); smb2cli_tcon_set_values(cli->smb2.tcon, + NULL, /* session */ saved_tid, 0, /* type */ 0, /* flags */ @@ -804,6 +805,7 @@ bool run_smb2_tcon_dependence(int dummy) tcon2_id = smb2cli_tcon_current_id(cli->smb2.tcon); tcon2_id++; smb2cli_tcon_set_values(tcon2, + NULL, /* session */ tcon2_id, 0, /* type */ 0, /* flags */ @@ -1718,6 +1720,7 @@ bool run_smb2_session_reauth(int dummy) saved_tcon = cli->smb2.tcon; cli->smb2.tcon = smbXcli_tcon_create(cli); smb2cli_tcon_set_values(cli->smb2.tcon, + NULL, /* session */ saved_tid, 0, /* type */ 0, /* flags */ @@ -1896,6 +1899,7 @@ bool run_smb2_session_reauth(int dummy) saved_tcon = cli->smb2.tcon; cli->smb2.tcon = smbXcli_tcon_create(cli); smb2cli_tcon_set_values(cli->smb2.tcon, + NULL, /* session */ saved_tid, 0, /* type */ 0, /* flags */ diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c index 8db7a622a2..5cdf258e7c 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -242,6 +242,7 @@ static void smb2_connect_tcon_done(struct smb2_request *smb2req) } smb2cli_tcon_set_values(state->tree->smbXcli, + state->session->smbXcli, state->tcon.out.tid, state->tcon.out.share_type, state->tcon.out.flags, diff --git a/source4/torture/smb2/compound.c b/source4/torture/smb2/compound.c index da4de3a739..6b65d8a487 100644 --- a/source4/torture/smb2/compound.c +++ b/source4/torture/smb2/compound.c @@ -88,6 +88,7 @@ static bool test_compound_related1(struct torture_context *tctx, tree->smbXcli = smbXcli_tcon_create(tree); smb2cli_tcon_set_values(tree->smbXcli, + NULL, /* session */ 0xFFFFFFFF, /* tcon_id */ 0, /* type */ 0, /* flags */ @@ -166,6 +167,7 @@ static bool test_compound_related2(struct torture_context *tctx, tree->smbXcli = smbXcli_tcon_create(tree); smb2cli_tcon_set_values(tree->smbXcli, + NULL, /* session */ 0xFFFFFFFF, /* tcon_id */ 0, /* type */ 0, /* flags */ @@ -378,6 +380,7 @@ static bool test_compound_invalid2(struct torture_context *tctx, tree->smbXcli = smbXcli_tcon_create(tree); smb2cli_tcon_set_values(tree->smbXcli, + NULL, /* session */ 0xFFFFFFFF, /* tcon_id */ 0, /* type */ 0, /* flags */ diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c index 4c53d65b2a..e83b099958 100644 --- a/source4/torture/smb2/notify.c +++ b/source4/torture/smb2/notify.c @@ -1821,6 +1821,7 @@ static struct smb2_tree *secondary_tcon(struct smb2_tree *tree, } smb2cli_tcon_set_values(tree1->smbXcli, + tree1->session->smbXcli, tcon.smb2.out.tid, tcon.smb2.out.share_type, tcon.smb2.out.flags, diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 250c4a27c7..71e87f3961 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -296,6 +296,7 @@ bool torture_smb2_tree_connect(struct torture_context *tctx, } smb2cli_tcon_set_values(tree->smbXcli, + tree->session->smbXcli, tcon.out.tid, tcon.out.share_type, tcon.out.flags, |