s4:libcli/torture:smb2: change smb2_tree_connect to take a smb2_session instead of...

Only the tree->session is needed. This way it is less confusing.

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index 6b980f2e0ef3b75c4aa4d5f39cd69474c037c0ca..b28013fc945650a6db9cfeb7027e0d9c6a01edc7 100644 (file)
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -214,7 +214,7 @@ static void smb2_connect_session_done(struct tevent_req *subreq)
                return;
        }
 
-       smb2req = smb2_tree_connect_send(state->tree, &state->tcon);
+       smb2req = smb2_tree_connect_send(state->session, &state->tcon);
        if (tevent_req_nomem(smb2req, req)) {
                return;
        }

diff --git a/source4/libcli/smb2/tcon.c b/source4/libcli/smb2/tcon.c
index c5e5b99f73e5c3cb47c71895b737bc220b6c6988..3a0f2460222258f46713729991ea5b02a772c3bd 100644 (file)
--- a/source4/libcli/smb2/tcon.c
+++ b/source4/libcli/smb2/tcon.c
@@ -46,17 +46,17 @@ struct smb2_tree *smb2_tree_init(struct smb2_session *session,
 /*
   send a tree connect
 */
-struct smb2_request *smb2_tree_connect_send(struct smb2_tree *tree, 
+struct smb2_request *smb2_tree_connect_send(struct smb2_session *session,
                                            struct smb2_tree_connect *io)
 {
        struct smb2_request *req;
        NTSTATUS status;
 
-       req = smb2_request_init(tree->session->transport, SMB2_OP_TCON, 
+       req = smb2_request_init(session->transport, SMB2_OP_TCON,
                                0x08, true, 0);
        if (req == NULL) return NULL;
 
-       req->session = tree->session;
+       req->session = session;
 
        SSVAL(req->out.body, 0x02, io->in.reserved);
        status = smb2_push_o16s16_string(&req->out, 0x04, io->in.path);
@@ -104,8 +104,8 @@ NTSTATUS smb2_tree_connect_recv(struct smb2_request *req, struct smb2_tree_conne
 /*
   sync tree connect request
 */
-NTSTATUS smb2_tree_connect(struct smb2_tree *tree, struct smb2_tree_connect *io)
+NTSTATUS smb2_tree_connect(struct smb2_session *session, struct smb2_tree_connect *io)
 {
-       struct smb2_request *req = smb2_tree_connect_send(tree, io);
+       struct smb2_request *req = smb2_tree_connect_send(session, io);
        return smb2_tree_connect_recv(req, io);
 }

diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index 070af0de9e3695fa195b4faf287215e17c733934..e4e26365e3c223070126ee23a7b171e7f1516d25 100644 (file)
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -1812,7 +1812,7 @@ static struct smb2_tree *secondary_tcon(struct smb2_tree *tree,
        ZERO_STRUCT(tcon.smb2);
        tcon.generic.level = RAW_TCON_SMB2;
        tcon.smb2.in.path = talloc_asprintf(tctx, "\\\\%s\\%s", host, share);
-       status = smb2_tree_connect(tree, &(tcon.smb2));
+       status = smb2_tree_connect(tree->session, &(tcon.smb2));
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(tree1);
                torture_comment(tctx,"Failed to create secondary tree\n");