diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-07-25 09:05:32 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-07-25 12:15:03 +0200 |
| commit | 167d94c73dc1b2c79dbc980a2094c90711500fbf (patch) | |
| tree | 727f9d5a1c1278b195484fe6ac970af8a014d1b1 /source3 | |
| parent | d2ba9c36f30e175f0715de10e72a34b6e0797718 (diff) | |
| download | samba-167d94c73dc1b2c79dbc980a2094c90711500fbf.tar.gz samba-167d94c73dc1b2c79dbc980a2094c90711500fbf.tar.bz2 samba-167d94c73dc1b2c79dbc980a2094c90711500fbf.zip | |
s3:libsmb: remove unused tcon specific elements from cli_state->smb2
metze
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/client.h | 6 | ||||
| -rw-r--r-- | source3/libsmb/smb2cli_tcon.c | 24 |
2 files changed, 13 insertions, 17 deletions
diff --git a/source3/include/client.h b/source3/include/client.h index b2b589a82e..34bdda121e 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -111,12 +111,6 @@ struct cli_state { uint32_t pid; struct smbXcli_session *session; struct smbXcli_tcon *tcon; - - /* SMB2 tcon */ - uint8_t share_type; - uint32_t share_flags; - uint32_t share_capabilities; - uint32_t maximal_access; } smb2; }; diff --git a/source3/libsmb/smb2cli_tcon.c b/source3/libsmb/smb2cli_tcon.c index ed5b00b329..7271ddaa8e 100644 --- a/source3/libsmb/smb2cli_tcon.c +++ b/source3/libsmb/smb2cli_tcon.c @@ -107,6 +107,10 @@ static void smb2cli_tcon_done(struct tevent_req *subreq) struct iovec *iov; uint8_t *body; uint32_t tcon_id; + uint8_t share_type; + uint32_t share_flags; + uint32_t share_capabilities; + uint32_t maximal_access; static const struct smb2cli_req_expected_response expected[] = { { .status = NT_STATUS_OK, @@ -116,8 +120,8 @@ static void smb2cli_tcon_done(struct tevent_req *subreq) status = smb2cli_req_recv(subreq, state, &iov, expected, ARRAY_SIZE(expected)); + TALLOC_FREE(subreq); if (!NT_STATUS_IS_OK(status)) { - TALLOC_FREE(subreq); tevent_req_nterror(req, status); return; } @@ -125,12 +129,10 @@ static void smb2cli_tcon_done(struct tevent_req *subreq) tcon_id = IVAL(iov[0].iov_base, SMB2_HDR_TID); body = (uint8_t *)iov[1].iov_base; - cli->smb2.share_type = CVAL(body, 2); - cli->smb2.share_flags = IVAL(body, 4); - cli->smb2.share_capabilities = IVAL(body, 8); - cli->smb2.maximal_access = IVAL(body, 12); - - TALLOC_FREE(subreq); + share_type = CVAL(body, 0x02); + share_flags = IVAL(body, 0x04); + share_capabilities = IVAL(body, 0x08); + maximal_access = IVAL(body, 0x0C); cli->smb2.tcon = smbXcli_tcon_create(cli); if (tevent_req_nomem(cli->smb2.tcon, req)) { @@ -139,10 +141,10 @@ static void smb2cli_tcon_done(struct tevent_req *subreq) smb2cli_tcon_set_values(cli->smb2.tcon, tcon_id, - cli->smb2.share_type, - cli->smb2.share_flags, - cli->smb2.share_capabilities, - cli->smb2.maximal_access); + share_type, + share_flags, + share_capabilities, + maximal_access); tevent_req_done(req); } |