svn commit: samba r24154 - in branches/SAMBA_3_2/source/smbd: .

[vlendec at samba.org]

Author: vlendec
Date: 2007-08-03 12:44:06 +0000 (Fri, 03 Aug 2007)
New Revision: 24154

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

Log:
handle_trans2 does not reference inbuf/outbuf anymore
Modified:
   branches/SAMBA_3_2/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_2/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/trans2.c	2007-08-03 12:15:58 UTC (rev 24153)
+++ branches/SAMBA_3_2/source/smbd/trans2.c	2007-08-03 12:44:06 UTC (rev 24154)
@@ -6859,14 +6859,12 @@
 	return(outsize);
 }
 
-static int handle_trans2(connection_struct *conn, struct smb_request *req,
-			 struct trans_state *state,
-			 char *inbuf, char *outbuf, int size, int bufsize)
+static void handle_trans2(connection_struct *conn, struct smb_request *req,
+			  struct trans_state *state)
 {
-	int outsize = -1;
-
 	if (Protocol >= PROTOCOL_NT1) {
-		SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2) | 0x40); /* IS_LONG_NAME */
+		req->flags2 |= 0x40; /* IS_LONG_NAME */
+		SSVAL(req->inbuf,smb_flg2,req->flags2);
 	}
 
 	/* Now we must call the relevant TRANS2 function */
@@ -7008,10 +7006,8 @@
 	default:
 		/* Error in request */
 		DEBUG(2,("Unknown request %d in trans2 call\n", state->call));
-		outsize = ERROR_DOS(ERRSRV,ERRerror);
+		reply_doserror(req, ERRSRV,ERRerror);
 	}
-
-	return outsize;
 }
 
 /****************************************************************************
@@ -7154,8 +7150,8 @@
 
 		init_smb_request(req, (uint8 *)inbuf);
 
-		outsize = handle_trans2(conn, req, state, inbuf, outbuf,
-					size, bufsize);
+		outsize = -1;
+		handle_trans2(conn, req, state);
 		if (req->outbuf != NULL) {
 			outsize = smb_len(req->outbuf) + 4;
 			memcpy(outbuf, req->outbuf, outsize);
@@ -7291,8 +7287,8 @@
 
 	init_smb_request(req, (uint8 *)inbuf);
 
-	outsize = handle_trans2(conn, req, state, inbuf, outbuf, size,
-				bufsize);
+	outsize = -1;
+	handle_trans2(conn, req, state);
 	if (req->outbuf != NULL) {
 		outsize = smb_len(req->outbuf) + 4;
 		memcpy(outbuf, req->outbuf, outsize);