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

[tridge at samba.org]

Author: tridge
Date: 2004-10-28 23:09:40 +0000 (Thu, 28 Oct 2004)
New Revision: 3341

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

Log:
- don't zero the async structure (makes valgrind more useful)

- get rid of req->mid, as it isn't a safe value to use to match
  requests in the server (it is safe in the client code, as we choose
  the mid, but in the server we can't rely on other clients to choose
  the mid carefully)


Modified:
   branches/SAMBA_4_0/source/smb_server/request.c
   branches/SAMBA_4_0/source/smb_server/smb_server.c
   branches/SAMBA_4_0/source/smb_server/smb_server.h


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/request.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/request.c	2004-10-28 23:06:12 UTC (rev 3340)
+++ branches/SAMBA_4_0/source/smb_server/request.c	2004-10-28 23:09:40 UTC (rev 3341)
@@ -57,11 +57,11 @@
 
 	req->async_states = talloc_p(req, struct ntvfs_async_state);
 	if (!req->async_states) {
+		talloc_free(req);
 		return NULL;
 	}
+	req->async_states->state = 0;
 
-	ZERO_STRUCTP(req->async_states);
-
 	return req;
 }
 

Modified: branches/SAMBA_4_0/source/smb_server/smb_server.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb_server.c	2004-10-28 23:06:12 UTC (rev 3340)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.c	2004-10-28 23:09:40 UTC (rev 3341)
@@ -624,7 +624,6 @@
 	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);

Modified: branches/SAMBA_4_0/source/smb_server/smb_server.h
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb_server.h	2004-10-28 23:06:12 UTC (rev 3340)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.h	2004-10-28 23:09:40 UTC (rev 3341)
@@ -89,9 +89,6 @@
 	/* 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;