The branch, master has been updated
via 8daf9df s3:smb2cli: fix the num_expected == 0 logic in
smb2cli_req_recv()
from 24d53eb s4:smb_server/smb2: make sure we sign the final session
setup
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8daf9df5148bc3977c676e4dec3263486d35fde9
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Sep 23 22:47:33 2011 +0200
s3:smb2cli: fix the num_expected == 0 logic in smb2cli_req_recv()
metze
Autobuild-User: Stefan Metzmacher <me...@samba.org>
Autobuild-Date: Thu Sep 29 22:15:06 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/libsmb/smb2cli_base.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/smb2cli_base.c b/source3/libsmb/smb2cli_base.c
index f8b2f6e..b85158f 100644
--- a/source3/libsmb/smb2cli_base.c
+++ b/source3/libsmb/smb2cli_base.c
@@ -690,9 +690,8 @@ NTSTATUS smb2cli_req_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
bool found_size = false;
size_t i;
- if (num_expected == 0) {
- found_status = true;
- found_size = true;
+ if (piov != NULL) {
+ *piov = NULL;
}
if (tevent_req_is_nterror(req, &status)) {
@@ -710,6 +709,11 @@ NTSTATUS smb2cli_req_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
return status;
}
+ if (num_expected == 0) {
+ found_status = true;
+ found_size = true;
+ }
+
status = NT_STATUS(IVAL(state->recv_iov[0].iov_base, SMB2_HDR_STATUS));
body_size = SVAL(state->recv_iov[1].iov_base, 0);
--
Samba Shared Repository
