summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/smb_server/request.c4
-rw-r--r--source4/smb_server/smb_server.c1
-rw-r--r--source4/smb_server/smb_server.h3
3 files changed, 2 insertions, 6 deletions
diff --git a/source4/smb_server/request.c b/source4/smb_server/request.c
index 34273a63a8..5b137b4c53 100644
--- a/source4/smb_server/request.c
+++ b/source4/smb_server/request.c
@@ -57,10 +57,10 @@ struct smbsrv_request *init_smb_request(struct smbsrv_connection *smb_conn)
req->async_states = talloc_p(req, struct ntvfs_async_state);
if (!req->async_states) {
+ talloc_free(req);
return NULL;
}
-
- ZERO_STRUCTP(req->async_states);
+ req->async_states->state = 0;
return req;
}
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 86a876554f..de3d60a6bd 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -624,7 +624,6 @@ static void construct_reply(struct smbsrv_request *req)
req->flags = CVAL(req->in.hdr, HDR_FLG);
req->flags2 = SVAL(req->in.hdr, HDR_FLG2);
req->smbpid = SVAL(req->in.hdr,HDR_PID);
- req->mid = SVAL(req->in.hdr,HDR_MID);
if (!req_signing_check_incoming(req)) {
req_reply_error(req, NT_STATUS_ACCESS_DENIED);
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 065c01d6f5..53ef5cd575 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -89,9 +89,6 @@ struct smbsrv_request {
/* the session context is derived from the vuid */
struct smbsrv_session *session;
- /* the mid of this packet - used to match replies */
- uint16_t mid;
-
/* a set of flags to control usage of the request. See REQ_CONTROL_* */
unsigned control_flags;