summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-07-25 09:31:15 +0200
committerStefan Metzmacher <metze@samba.org>2012-07-25 12:15:04 +0200
commit57fda88dfb685ca9ba84cda6799efcc2224e242f (patch)
tree58d3a8b4d7d1d8b6deba1bd81ea68146b61d795d
parent56af56d041c89bee6dc2a71a9b0faa85a22150d9 (diff)
downloadsamba-57fda88dfb685ca9ba84cda6799efcc2224e242f.tar.gz
samba-57fda88dfb685ca9ba84cda6799efcc2224e242f.tar.bz2
samba-57fda88dfb685ca9ba84cda6799efcc2224e242f.zip
s4:libcli/smb2: remove unused elements from smb2_tree
metze
-rw-r--r--source4/libcli/smb2/connect.c3
-rw-r--r--source4/libcli/smb2/request.c1
-rw-r--r--source4/libcli/smb2/smb2.h2
-rw-r--r--source4/torture/smb2/notify.c7
-rw-r--r--source4/torture/smb2/util.c3
5 files changed, 3 insertions, 13 deletions
diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index 41f2d4bfa9..8db7a622a2 100644
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -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,
diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c
index 2fcc381314..4a40d832fc 100644
--- a/source4/libcli/smb2/request.c
+++ b/source4/libcli/smb2/request.c
@@ -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;
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index 569028e63c..57b6210e2a 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -106,8 +106,6 @@ struct smb2_transport {
*/
struct smb2_tree {
struct smb2_session *session;
- uint32_t tid;
- uint32_t capabilities;
struct smbXcli_tcon *smbXcli;
};
diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index c374ae781e..4c53d65b2a 100644
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -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;
}
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 0e5f1e1f07..250c4a27c7 100644
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -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,