libcli/smb: pass smbXcli_session to smb2cli_tcon_set_values()

metze

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 275dfed32c1f5889376edca648656801cbb5e040..9e00ba9cab08814a6008bef7f564377a88febe99 100644 (file)
--- 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 5c524b0ec862f0e68dcf5fafa03375b69fd2d9d9..804fe4428a82c28b0b7ea75ad13b7ce0f0f4b3b3 100644 (file)
--- 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 2a37088885fce0728d04df66c68f2063d7c22e1c..ca44311f5c463d5a0933a17546860f944f6c1aee 100644 (file)
--- 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 d46ecf065e202477892e6cf1db789647bdbc1dc1..79ffef19582e12041d7eb3d489e4a1cf9aa4b804 100644 (file)
--- 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 8db7a622a2de9aa53aed544476767f744b7feca1..5cdf258e7c0517c129546dbd28baf2b44058156b 100644 (file)
--- 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 da4de3a73993bc07176b26da2c56f198a26c840a..6b65d8a48788cfeaeb115f813ec4d9872b707f8b 100644 (file)
--- 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 4c53d65b2a773e8a8a296155da02687430a66aed..e83b09995828ae69645d722b07cb3383d421bf31 100644 (file)
--- 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 250c4a27c7b2cc71c5d33fe6182f2a32e8731db8..71e87f3961e44c9a55ea1aac0c64d5de2d578c65 100644 (file)
--- 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,