svn commit: samba r16870 - in branches/SAMBA_4_0/source/smb_server/smb2: .

[metze at samba.org]

Author: metze
Date: 2006-07-08 07:42:25 +0000 (Sat, 08 Jul 2006)
New Revision: 16870

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16870

Log:
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
Modified:
   branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h	2006-07-08 07:39:06 UTC (rev 16869)
+++ branches/SAMBA_4_0/source/smb_server/smb2/smb2_server.h	2006-07-08 07:42:25 UTC (rev 16870)
@@ -136,6 +136,7 @@
 /* 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 @@
 } 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; \