summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-08-02 20:06:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:29:12 -0500
commitfa2b8a447af818e6f2547d3a8b996f2220737beb (patch)
tree361d5ae55ed15c662afd99a46a633e38081ed86c
parent2945d4492d10d83acd2d345339da941db5d7fc53 (diff)
downloadsamba-fa2b8a447af818e6f2547d3a8b996f2220737beb.tar.gz
samba-fa2b8a447af818e6f2547d3a8b996f2220737beb.tar.bz2
samba-fa2b8a447af818e6f2547d3a8b996f2220737beb.zip
r24142: Remove some direct inbuf references from call_trans2qfilepathinfo
(This used to be commit c9c0133d5512e68fcaf22b2abd3343ae944ddb9d)
-rw-r--r--source3/smbd/trans2.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index c85585464d..9bae8a416e 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3401,7 +3401,9 @@ static int call_trans2qpipeinfo(connection_struct *conn, char *inbuf, char *outb
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 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
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 @@ static int handle_trans2(connection_struct *conn, struct smb_request *req,
{
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);