diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-03 00:15:27 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-03 00:15:27 +0100 |
commit | c5a70cab25de3b0acd89ba12150b9077bb59cbb5 (patch) | |
tree | da8887ad758b62641006185c64b7d46c6c650f68 /source3/include/srvstr.h | |
parent | 1575cae7e53a5738d7e2530e855aef68ca971706 (diff) | |
parent | 7808a2594c22ff452d54d2e9e272aa60e4b7e482 (diff) | |
download | samba-c5a70cab25de3b0acd89ba12150b9077bb59cbb5.tar.gz samba-c5a70cab25de3b0acd89ba12150b9077bb59cbb5.tar.bz2 samba-c5a70cab25de3b0acd89ba12150b9077bb59cbb5.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/srvstr.h')
-rw-r--r-- | source3/include/srvstr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/srvstr.h b/source3/include/srvstr.h index 0e8e275655..7e7d8a2e92 100644 --- a/source3/include/srvstr.h +++ b/source3/include/srvstr.h @@ -25,5 +25,6 @@ end of the smbbuf area */ -#define srvstr_pull_buf_talloc(ctx, inbuf, smb_flags2, dest, src, flags) \ - pull_string_talloc(ctx, inbuf, smb_flags2, dest, src, smb_bufrem(inbuf, src), flags) +#define srvstr_pull_req_talloc(ctx, req_, dest, src, flags) \ + pull_string_talloc(ctx, req_->inbuf, req_->flags2, dest, src, \ + smbreq_bufrem(req_, src), flags) |