diff options
author | Stefan Metzmacher <metze@samba.org> | 2011-08-31 00:40:06 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2011-09-18 05:33:10 +0200 |
commit | 271f78a9bb814ed10bcc8883a60d6609e1eef500 (patch) | |
tree | 5a33c7c4a1971696c43e30f1986a2ecf7e43d5ac /source3/libsmb/smb2cli_tcon.c | |
parent | b6b767a2c47b26c1758520212b4f09ddb934c9f3 (diff) | |
download | samba-271f78a9bb814ed10bcc8883a60d6609e1eef500.tar.gz samba-271f78a9bb814ed10bcc8883a60d6609e1eef500.tar.bz2 samba-271f78a9bb814ed10bcc8883a60d6609e1eef500.zip |
s3:smb2cli: pass an array of expected status/body_size pairs to smb2cli_req_recv()
This gives the caller more control and correctly reports unexpected
errors to the caller, instead of return NT_STATUS_INVALID_NETWOR_RESPONSE
metze
Diffstat (limited to 'source3/libsmb/smb2cli_tcon.c')
-rw-r--r-- | source3/libsmb/smb2cli_tcon.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/source3/libsmb/smb2cli_tcon.c b/source3/libsmb/smb2cli_tcon.c index 9cf73e3a4b..dee9140ce6 100644 --- a/source3/libsmb/smb2cli_tcon.c +++ b/source3/libsmb/smb2cli_tcon.c @@ -105,8 +105,15 @@ static void smb2cli_tcon_done(struct tevent_req *subreq) NTSTATUS status; struct iovec *iov; uint8_t *body; + static const struct smb2cli_req_expected_response expected[] = { + { + .status = NT_STATUS_OK, + .body_size = 0x10 + } + }; - status = smb2cli_req_recv(subreq, talloc_tos(), &iov, 16); + status = smb2cli_req_recv(subreq, talloc_tos(), &iov, + expected, ARRAY_SIZE(expected)); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(subreq); tevent_req_nterror(req, status); @@ -202,8 +209,15 @@ static void smb2cli_tdis_done(struct tevent_req *subreq) struct tevent_req); NTSTATUS status; struct iovec *iov; + static const struct smb2cli_req_expected_response expected[] = { + { + .status = NT_STATUS_OK, + .body_size = 0x04 + } + }; - status = smb2cli_req_recv(subreq, talloc_tos(), &iov, 4); + status = smb2cli_req_recv(subreq, talloc_tos(), &iov, + expected, ARRAY_SIZE(expected)); TALLOC_FREE(subreq); if (tevent_req_nterror(req, status)) { return; |