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/smbd/message.c | |
| 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/smbd/message.c')
| -rw-r--r-- | source3/smbd/message.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/source3/smbd/message.c b/source3/smbd/message.c index 6977b586df..65eaeca777 100644 --- a/source3/smbd/message.c +++ b/source3/smbd/message.c @@ -154,17 +154,15 @@ void reply_sends(struct smb_request *req) state = talloc(talloc_tos(), struct msg_state); p = (const char *)req->buf + 1; - p += srvstr_pull_buf_talloc( - state, (char *)req->inbuf, req->flags2, &state->from, p, - STR_ASCII|STR_TERMINATE) + 1; - p += srvstr_pull_buf_talloc( - state, (char *)req->inbuf, req->flags2, &state->to, p, - STR_ASCII|STR_TERMINATE) + 1; + p += srvstr_pull_req_talloc( + state, req, &state->from, p, STR_ASCII|STR_TERMINATE) + 1; + p += srvstr_pull_req_talloc( + state, req, &state->to, p, STR_ASCII|STR_TERMINATE) + 1; msg = p; len = SVAL(msg,0); - len = MIN(len, smb_bufrem(req->inbuf, msg+2)); + len = MIN(len, smbreq_bufrem(req, msg+2)); state->msg = talloc_array(state, char, len); @@ -212,12 +210,12 @@ void reply_sendstrt(struct smb_request *req) } p = (const char *)req->buf+1; - p += srvstr_pull_buf_talloc( - smbd_msg_state, (char *)req->inbuf, req->flags2, - &smbd_msg_state->from, p, STR_ASCII|STR_TERMINATE) + 1; - p += srvstr_pull_buf_talloc( - smbd_msg_state, (char *)req->inbuf, req->flags2, - &smbd_msg_state->to, p, STR_ASCII|STR_TERMINATE) + 1; + p += srvstr_pull_req_talloc( + smbd_msg_state, req, &smbd_msg_state->from, p, + STR_ASCII|STR_TERMINATE) + 1; + p += srvstr_pull_req_talloc( + smbd_msg_state, req, &smbd_msg_state->to, p, + STR_ASCII|STR_TERMINATE) + 1; DEBUG( 3, ( "SMBsendstrt (from %s to %s)\n", smbd_msg_state->from, smbd_msg_state->to ) ); @@ -258,7 +256,7 @@ void reply_sendtxt(struct smb_request *req) old_len = talloc_get_size(smbd_msg_state->msg); - len = MIN(SVAL(msg, 0), smb_bufrem(req->inbuf, msg+2)); + len = MIN(SVAL(msg, 0), smbreq_bufrem(req, msg+2)); tmp = TALLOC_REALLOC_ARRAY(smbd_msg_state, smbd_msg_state->msg, char, old_len + len); |