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

[vlendec at samba.org]

Author: vlendec
Date: 2007-08-02 20:06:15 +0000 (Thu, 02 Aug 2007)
New Revision: 24142

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

Log:
Remove some direct inbuf references from call_trans2qfilepathinfo
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-02 19:50:56 UTC (rev 24141)
+++ branches/SAMBA_3_2/source/smbd/trans2.c	2007-08-02 20:06:15 UTC (rev 24142)
@@ -3401,7 +3401,9 @@
  file name or file id).
 ****************************************************************************/
 
-static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
+static int call_trans2qfilepathinfo(connection_struct *conn,
+				    struct smb_request *req,
+				    char *inbuf, char *outbuf, int length, int bufsize,
 					unsigned int tran_call,
 					char **pparams, int total_params, char **ppdata, int total_data,
 					unsigned int max_data_bytes)
@@ -3527,14 +3529,16 @@
 			return ERROR_NT(NT_STATUS_INVALID_LEVEL);
 		}
 
-		srvstr_get_path(inbuf, SVAL(inbuf,smb_flg2), fname, &params[6],
+		srvstr_get_path(params, req->flags2, fname, &params[6],
 				sizeof(fname), total_params - 6,
 				STR_TERMINATE, &status);
 		if (!NT_STATUS_IS_OK(status)) {
 			return ERROR_NT(status);
 		}
 
-		status = resolve_dfspath(conn, SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES, fname);
+		status = resolve_dfspath(conn,
+					 req->flags2 & FLAGS2_DFS_PATHNAMES,
+					 fname);
 		if (!NT_STATUS_IS_OK(status)) {
 			if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
 				return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, ERRSRV, ERRbadpath);
@@ -6767,7 +6771,8 @@
 	{
 		START_PROFILE(Trans2_qpathinfo);
 		outsize = call_trans2qfilepathinfo(
-			conn, inbuf, outbuf, size, bufsize, state->call,
+			conn, req,
+			inbuf, outbuf, size, bufsize, state->call,
 			&state->param, state->total_param,
 			&state->data, state->total_data,
 			state->max_data_return);