diff options
Diffstat (limited to 'source3/rpc_server/srv_pipe.c')
| -rw-r--r-- | source3/rpc_server/srv_pipe.c | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index a246b6db50..90eb4f96c3 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -647,7 +647,7 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob) bool ret; DEBUG(5,("pipe_ntlmssp_verify_final: pipe %s checking user details\n", - get_pipe_name_from_iface(&p->syntax))); + get_pipe_name_from_syntax(talloc_tos(), &p->syntax))); ZERO_STRUCT(reply); @@ -671,7 +671,8 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob) if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN)) { DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet integrity requested " "but client declined signing.\n", - get_pipe_name_from_iface(&p->syntax))); + get_pipe_name_from_syntax(talloc_tos(), + &p->syntax))); return False; } } @@ -679,7 +680,8 @@ static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob) if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL)) { DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet privacy requested " "but client declined sealing.\n", - get_pipe_name_from_iface(&p->syntax))); + get_pipe_name_from_syntax(talloc_tos(), + &p->syntax))); return False; } } @@ -995,7 +997,7 @@ static bool check_bind_req(struct pipes_struct *p, struct pipe_rpc_fns *context_fns; DEBUG(3,("check_bind_req for %s\n", - get_pipe_name_from_iface(&p->syntax))); + get_pipe_name_from_syntax(talloc_tos(), &p->syntax))); /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */ @@ -1607,7 +1609,8 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p) /* No rebinds on a bound pipe - use alter context. */ if (p->pipe_bound) { DEBUG(2,("api_pipe_bind_req: rejecting bind request on bound " - "pipe %s.\n", get_pipe_name_from_iface(&p->syntax))); + "pipe %s.\n", + get_pipe_name_from_syntax(talloc_tos(), &p->syntax))); return setup_bind_nak(p); } @@ -1672,12 +1675,15 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p) NTSTATUS status; status = smb_probe_module( - "rpc", get_pipe_name_from_iface( + "rpc", get_pipe_name_from_syntax( + talloc_tos(), &hdr_rb.rpc_context[0].abstract)); if (NT_STATUS_IS_ERR(status)) { DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in bind request.\n", - get_pipe_name_from_iface(&hdr_rb.rpc_context[0].abstract))); + get_pipe_name_from_syntax( + talloc_tos(), + &hdr_rb.rpc_context[0].abstract))); prs_mem_free(&p->out_data.frag); prs_mem_free(&out_hdr_ba); prs_mem_free(&out_auth); @@ -1687,7 +1693,8 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p) for (i = 0; i < rpc_lookup_size; i++) { if (strequal(rpc_lookup[i].pipe.clnt, - get_pipe_name_from_iface(&p->syntax))) { + get_pipe_name_from_syntax(talloc_tos(), + &p->syntax))) { DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n", rpc_lookup[i].pipe.clnt, rpc_lookup[i].pipe.srv)); break; @@ -1697,8 +1704,10 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p) if (i == rpc_lookup_size) { DEBUG(0, ("module %s doesn't provide functions for " "pipe %s!\n", - get_pipe_name_from_iface(&p->syntax), - get_pipe_name_from_iface(&p->syntax))); + get_pipe_name_from_syntax(talloc_tos(), + &p->syntax), + get_pipe_name_from_syntax(talloc_tos(), + &p->syntax))); goto err_exit; } } @@ -2356,7 +2365,7 @@ bool api_pipe_request(pipes_struct *p) } DEBUG(5, ("Requested \\PIPE\\%s\n", - get_pipe_name_from_iface(&p->syntax))); + get_pipe_name_from_syntax(talloc_tos(), &p->syntax))); /* get the set of RPC functions for this context */ @@ -2370,7 +2379,7 @@ bool api_pipe_request(pipes_struct *p) else { DEBUG(0,("api_pipe_request: No rpc function table associated with context [%d] on pipe [%s]\n", p->hdr_req.context_id, - get_pipe_name_from_iface(&p->syntax))); + get_pipe_name_from_syntax(talloc_tos(), &p->syntax))); } if (changed_user) { @@ -2392,12 +2401,13 @@ static bool api_rpcTNP(pipes_struct *p, /* interpret the command */ DEBUG(4,("api_rpcTNP: %s op 0x%x - ", - get_pipe_name_from_iface(&p->syntax), p->hdr_req.opnum)); + get_pipe_name_from_syntax(talloc_tos(), &p->syntax), + p->hdr_req.opnum)); if (DEBUGLEVEL >= 50) { fstring name; slprintf(name, sizeof(name)-1, "in_%s", - get_pipe_name_from_iface(&p->syntax)); + get_pipe_name_from_syntax(talloc_tos(), &p->syntax)); prs_dump(name, p->hdr_req.opnum, &p->in_data.data); } @@ -2426,7 +2436,7 @@ static bool api_rpcTNP(pipes_struct *p, /* do the actual command */ if(!api_rpc_cmds[fn_num].fn(p)) { DEBUG(0,("api_rpcTNP: %s: %s failed.\n", - get_pipe_name_from_iface(&p->syntax), + get_pipe_name_from_syntax(talloc_tos(), &p->syntax), api_rpc_cmds[fn_num].name)); prs_mem_free(&p->out_data.rdata); return False; @@ -2451,13 +2461,13 @@ static bool api_rpcTNP(pipes_struct *p, if (DEBUGLEVEL >= 50) { fstring name; slprintf(name, sizeof(name)-1, "out_%s", - get_pipe_name_from_iface(&p->syntax)); + get_pipe_name_from_syntax(talloc_tos(), &p->syntax)); prs_dump(name, p->hdr_req.opnum, &p->out_data.rdata); } prs_set_offset(&p->out_data.rdata, offset2); DEBUG(5,("api_rpcTNP: called %s successfully\n", - get_pipe_name_from_iface(&p->syntax))); + get_pipe_name_from_syntax(talloc_tos(), &p->syntax))); /* Check for buffer underflow in rpc parsing */ |