summaryrefslogtreecommitdiff
path: root/source3/smbd/nttrans.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-11-01 17:35:48 +0100
committerVolker Lendecke <vl@samba.org>2008-11-01 19:41:08 +0100
commit7bdb571ec4eea6689fa08f40be8b4c0133504f50 (patch)
tree065cb30f64d587e5fc40799e0dba394410ff3cef /source3/smbd/nttrans.c
parentac97d7d4b023db8d0e0fef1dc7f2f7b88028eae3 (diff)
downloadsamba-7bdb571ec4eea6689fa08f40be8b4c0133504f50.tar.gz
samba-7bdb571ec4eea6689fa08f40be8b4c0133504f50.tar.bz2
samba-7bdb571ec4eea6689fa08f40be8b4c0133504f50.zip
Remove a bunch of direct inbuf references by adding "buf" to smb_request
Diffstat (limited to 'source3/smbd/nttrans.c')
-rw-r--r--source3/smbd/nttrans.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 30841686fb..dace8f6d8c 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -308,7 +308,7 @@ static void do_ntcreate_pipe_open(connection_struct *conn,
TALLOC_CTX *ctx = talloc_tos();
srvstr_pull_buf_talloc(ctx, (char *)req->inbuf, req->flags2, &fname,
- smb_buf(req->inbuf), STR_TERMINATE);
+ req->buf, STR_TERMINATE);
if (!fname) {
reply_botherror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND,
@@ -425,7 +425,7 @@ void reply_ntcreate_and_X(struct smb_request *req)
#endif
srvstr_get_path(ctx, (char *)req->inbuf, req->flags2, &fname,
- smb_buf(req->inbuf), 0, STR_TERMINATE, &status);
+ (const char *)req->buf, 0, STR_TERMINATE, &status);
if (!NT_STATUS_IS_OK(status)) {
reply_nterror(req, status);
@@ -1228,7 +1228,7 @@ void reply_ntrename(struct smb_request *req)
connection_struct *conn = req->conn;
char *oldname = NULL;
char *newname = NULL;
- char *p;
+ const char *p;
NTSTATUS status;
bool src_has_wcard = False;
bool dest_has_wcard = False;
@@ -1247,7 +1247,7 @@ void reply_ntrename(struct smb_request *req)
attrs = SVAL(req->inbuf,smb_vwv0);
rename_type = SVAL(req->inbuf,smb_vwv1);
- p = smb_buf(req->inbuf) + 1;
+ p = (const char *)req->buf + 1;
p += srvstr_get_path_wcard(ctx, (char *)req->inbuf, req->flags2, &oldname, p,
0, STR_TERMINATE, &status,
&src_has_wcard);