diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-14 12:03:11 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-14 12:03:11 +0100 |
| commit | 02af3663a457ebc6aa30e79614e44fb16be8cadd (patch) | |
| tree | c4497d370126fbf328df34e7a1257eac2c58f386 /source4/libcli/raw/rawfile.c | |
| parent | 21c0f266616e093cccbaf9378b3a915e56ba6079 (diff) | |
| parent | b640f475be9b0f83e7812a5c7756344c5891cba3 (diff) | |
| download | samba-02af3663a457ebc6aa30e79614e44fb16be8cadd.tar.gz samba-02af3663a457ebc6aa30e79614e44fb16be8cadd.tar.bz2 samba-02af3663a457ebc6aa30e79614e44fb16be8cadd.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 50697762fd28e2fc77142c5fea528b12d4cc0ebc)
Diffstat (limited to 'source4/libcli/raw/rawfile.c')
| -rw-r--r-- | source4/libcli/raw/rawfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c index 3b6ca68526..d9383401b7 100644 --- a/source4/libcli/raw/rawfile.c +++ b/source4/libcli/raw/rawfile.c @@ -616,7 +616,7 @@ NTSTATUS smb_raw_open_recv(struct smbcli_request *req, TALLOC_CTX *mem_ctx, unio case RAW_OPEN_CTEMP: SMBCLI_CHECK_WCT(req, 1); parms->ctemp.out.file.fnum = SVAL(req->in.vwv, VWV(0)); - smbcli_req_pull_string(req, mem_ctx, &parms->ctemp.out.name, req->in.data, -1, STR_TERMINATE | STR_ASCII); + smbcli_req_pull_string(&req->in.bufinfo, mem_ctx, &parms->ctemp.out.name, req->in.data, -1, STR_TERMINATE | STR_ASCII); break; case RAW_OPEN_SPLOPEN: @@ -675,7 +675,7 @@ NTSTATUS smb_raw_open_recv(struct smbcli_request *req, TALLOC_CTX *mem_ctx, unio parms->openxreadx.out.nread = SVAL(req->in.vwv, VWV(5)); if (parms->openxreadx.out.nread > MAX(parms->openxreadx.in.mincnt, parms->openxreadx.in.maxcnt) || - !smbcli_raw_pull_data(req, req->in.hdr + SVAL(req->in.vwv, VWV(6)), + !smbcli_raw_pull_data(&req->in.bufinfo, req->in.hdr + SVAL(req->in.vwv, VWV(6)), parms->openxreadx.out.nread, parms->openxreadx.out.data)) { req->status = NT_STATUS_BUFFER_TOO_SMALL; |