diff options
author | Stefan Metzmacher <metze@samba.org> | 2006-07-08 07:42:25 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:55 -0500 |
commit | f0f7070ad70c73a1e5c2cf7c5111e39c372845cd (patch) | |
tree | 01b986e5edd13fad91bc3d44705c04557b2b1588 /source4/smb_server | |
parent | cf901ad491c82794ff28980055466cf117bb0d72 (diff) | |
download | samba-f0f7070ad70c73a1e5c2cf7c5111e39c372845cd.tar.gz samba-f0f7070ad70c73a1e5c2cf7c5111e39c372845cd.tar.bz2 samba-f0f7070ad70c73a1e5c2cf7c5111e39c372845cd.zip |
r16870: copy over the status from the ntvfs request to the smb2 request
so that smb2srv_setup_reply() doesn't push uninitialized data
(found by valgrind)
metze
(This used to be commit 1a1fd2747d12663ff1084a3bc85e85c74188edb7)
Diffstat (limited to 'source4/smb_server')
-rw-r--r-- | source4/smb_server/smb2/smb2_server.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/smb_server/smb2/smb2_server.h b/source4/smb_server/smb2/smb2_server.h index 76d11e019c..ce13756836 100644 --- a/source4/smb_server/smb2/smb2_server.h +++ b/source4/smb_server/smb2/smb2_server.h @@ -136,6 +136,7 @@ struct smbsrv_request; /* check req->ntvfs->async_states->status and if not OK then send an error reply */ #define SMB2SRV_CHECK_ASYNC_STATUS_ERR_SIMPLE do { \ req = talloc_get_type(ntvfs->async_states->private_data, struct smb2srv_request); \ + req->status = ntvfs->async_states->status; \ if (NT_STATUS_IS_ERR(ntvfs->async_states->status)) { \ smb2srv_send_error(req, ntvfs->async_states->status); \ return; \ @@ -147,6 +148,7 @@ struct smbsrv_request; } while (0) #define SMB2SRV_CHECK_ASYNC_STATUS_SIMPLE do { \ req = talloc_get_type(ntvfs->async_states->private_data, struct smb2srv_request); \ + req->status = ntvfs->async_states->status; \ if (!NT_STATUS_IS_OK(ntvfs->async_states->status)) { \ smb2srv_send_error(req, ntvfs->async_states->status); \ return; \ |