diff options
author | Simo Sorce <idra@samba.org> | 2010-07-11 10:37:07 -0400 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2010-07-13 14:44:11 +0200 |
commit | fe9036cf5bd8aa775a0419be8effae257d6f97f2 (patch) | |
tree | 649af225397f0033cd4f22118410453e3fa18a82 | |
parent | 272704e8c24cff706c5ce38567f7ab35b335cf92 (diff) | |
download | samba-fe9036cf5bd8aa775a0419be8effae257d6f97f2.tar.gz samba-fe9036cf5bd8aa775a0419be8effae257d6f97f2.tar.bz2 samba-fe9036cf5bd8aa775a0419be8effae257d6f97f2.zip |
s3-dcerpc: pass the packet to setup_bind_nack()
Allows to not rely on p->call_id but use the value directly from the request
packet header.
Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r-- | source3/rpc_server/srv_pipe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 559ac5d4ba..53ddfcbafd 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -839,7 +839,7 @@ bool api_pipe_bind_auth3(pipes_struct *p, struct ncacn_packet *pkt) Marshall a bind_nak pdu. *******************************************************************/ -static bool setup_bind_nak(pipes_struct *p) +static bool setup_bind_nak(pipes_struct *p, struct ncacn_packet *pkt) { NTSTATUS status; union dcerpc_payload u; @@ -869,7 +869,7 @@ static bool setup_bind_nak(pipes_struct *p) DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST, 0, - p->call_id, + pkt->call_id, u, &blob); if (!NT_STATUS_IS_OK(status)) { @@ -1527,7 +1527,7 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt) DEBUG(2,("api_pipe_bind_req: rejecting bind request on bound " "pipe %s.\n", get_pipe_name_from_syntax(talloc_tos(), &p->syntax))); - return setup_bind_nak(p); + return setup_bind_nak(p, pkt); } prs_init_empty(&p->out_data.frag, p->mem_ctx, MARSHALL); @@ -1585,7 +1585,7 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt) prs_mem_free(&out_hdr_ba); prs_mem_free(&out_auth); - return setup_bind_nak(p); + return setup_bind_nak(p, pkt); } if (rpc_srv_get_pipe_interface_by_cli_name( @@ -1825,7 +1825,7 @@ bool api_pipe_bind_req(pipes_struct *p, struct ncacn_packet *pkt) prs_mem_free(&p->out_data.frag); prs_mem_free(&out_hdr_ba); prs_mem_free(&out_auth); - return setup_bind_nak(p); + return setup_bind_nak(p, pkt); } /**************************************************************************** @@ -2051,7 +2051,7 @@ bool api_pipe_alter_context(pipes_struct *p, struct ncacn_packet *pkt) prs_mem_free(&p->out_data.frag); prs_mem_free(&out_hdr_ba); prs_mem_free(&out_auth); - return setup_bind_nak(p); + return setup_bind_nak(p, pkt); } /**************************************************************************** |