summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-08-03 09:09:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:29:13 -0500
commitf2e2c22b6f6fd1639bf91f027dd8989fc6bf0659 (patch)
tree749568dee38b04af9e8513f3f2052c00c6161833
parentfe92fdc67db225d80aedbff45e3fa64fae961ee3 (diff)
downloadsamba-f2e2c22b6f6fd1639bf91f027dd8989fc6bf0659.tar.gz
samba-f2e2c22b6f6fd1639bf91f027dd8989fc6bf0659.tar.bz2
samba-f2e2c22b6f6fd1639bf91f027dd8989fc6bf0659.zip
r24147: Remove some inbuf refs from call_trans2setfilepathinfo
(This used to be commit a13c42be7548fc0de3e1f6f1eaacbad3046af0d0)
-rw-r--r--source3/smbd/trans2.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 803a2eb306..c6a17cc93b 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -6123,14 +6123,16 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
}
info_level = SVAL(params,0);
- 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);
@@ -6421,11 +6423,11 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
if (!NT_STATUS_IS_OK(status)) {
- if (open_was_deferred(SVAL(inbuf,smb_mid))) {
+ if (open_was_deferred(req->mid)) {
/* We have re-scheduled this call. */
return -1;
}
- if (blocking_lock_was_deferred(SVAL(inbuf,smb_mid))) {
+ if (blocking_lock_was_deferred(req->mid)) {
/* We have re-scheduled this call. */
return -1;
}