s4:libcli/smb2: remove unused elements from smb2_tree
authorStefan Metzmacher <metze@samba.org>
Wed, 25 Jul 2012 07:31:15 +0000 (09:31 +0200)
committerStefan Metzmacher <metze@samba.org>
Wed, 25 Jul 2012 10:15:04 +0000 (12:15 +0200)
metze

source4/libcli/smb2/connect.c
source4/libcli/smb2/request.c
source4/libcli/smb2/smb2.h
source4/torture/smb2/notify.c
source4/torture/smb2/util.c

index 41f2d4bfa937a00fe094ae502894a86ae97ca0cd..8db7a622a2de9aa53aed544476767f744b7feca1 100644 (file)
@@ -241,9 +241,6 @@ static void smb2_connect_tcon_done(struct smb2_request *smb2req)
                return;
        }
 
-       state->tree->tid = state->tcon.out.tid;
-       state->tree->capabilities = state->tcon.out.capabilities;
-
        smb2cli_tcon_set_values(state->tree->smbXcli,
                                state->tcon.out.tid,
                                state->tcon.out.share_type,
index 2fcc3813143582c1af638a6166d0f0299cae3c6a..4a40d832fce7177ef9c9b95bc18745feb38185d0 100644 (file)
@@ -127,7 +127,6 @@ struct smb2_request *smb2_request_init_tree(struct smb2_tree *tree, uint16_t opc
        if (req == NULL) return NULL;
 
        SIVAL(req->out.hdr,  SMB2_HDR_PID, tree->session->pid);
-       SIVAL(req->out.hdr,  SMB2_HDR_TID, tree->tid);
        req->session = tree->session;
        req->tree = tree;
 
index 569028e63c91af20d0ee4342a57c60571c9b9503..57b6210e2a2fc930aa09d1fb400939b9e1e99851 100644 (file)
@@ -106,8 +106,6 @@ struct smb2_transport {
 */
 struct smb2_tree {
        struct smb2_session *session;
-       uint32_t tid;
-       uint32_t capabilities;
        struct smbXcli_tcon *smbXcli;
 };
 
index c374ae781e7f5cd89621cf72f3f4b27f81202366..4c53d65b2a773e8a8a296155da02687430a66aed 100644 (file)
@@ -1820,9 +1820,6 @@ static struct smb2_tree *secondary_tcon(struct smb2_tree *tree,
                return NULL;
        }
 
-       tree1->tid = tcon.smb2.out.tid;
-       tree1->capabilities = tcon.smb2.out.capabilities;
-
        smb2cli_tcon_set_values(tree1->smbXcli,
                                tcon.smb2.out.tid,
                                tcon.smb2.out.share_type,
@@ -1830,7 +1827,9 @@ static struct smb2_tree *secondary_tcon(struct smb2_tree *tree,
                                tcon.smb2.out.capabilities,
                                tcon.smb2.out.access_mask);
 
-       torture_comment(tctx,"tid1=%d tid2=%d\n", tree->tid, tree1->tid);
+       torture_comment(tctx,"tid1=%d tid2=%d\n",
+                       smb2cli_tcon_current_id(tree->smbXcli),
+                       smb2cli_tcon_current_id(tree1->smbXcli));
 
        return tree1;
 }
index 0e5f1e1f0744a6a680b46764956c46e2bbcf7122..250c4a27c7b2cc71c5d33fe6182f2a32e8731db8 100644 (file)
@@ -295,9 +295,6 @@ bool torture_smb2_tree_connect(struct torture_context *tctx,
                return false;
        }
 
-       tree->tid = tcon.out.tid;
-       tree->capabilities = tcon.out.capabilities;
-
        smb2cli_tcon_set_values(tree->smbXcli,
                                tcon.out.tid,
                                tcon.out.share_type,