sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-31 17:18:04 +03:00
Code

Merge branch 'master' of ssh://git.samba.org/data/git/samba

Browse Source
This commit is contained in:
Jelmer Vernooij 2009-01-22 11:37:27 +01:00
commit 8f68a716fd
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/include/proto.h
View File

@ -5771,7 +5771,6 @@ bool prs_data_blob(prs_struct *prs, DATA_BLOB *blob, TALLOC_CTX *mem_ctx);
/* The following definitions come from rpc_parse/parse_rpc.c */
const char *cli_get_pipe_name_from_iface(TALLOC_CTX *mem_ctx,
struct cli_state *cli,
const struct ndr_syntax_id *interface);
void init_rpc_hdr(RPC_HDR *hdr, enum RPC_PKT_TYPE pkt_type, uint8 flags,
uint32 call_id, int data_len, int auth_len);

5
source3/rpc_client/cli_pipe.c
View File

@ -82,7 +82,6 @@ static const struct pipe_id_info {
****************************************************************************/
const char *cli_get_pipe_name_from_iface(TALLOC_CTX *mem_ctx,
struct cli_state *cli,
const struct ndr_syntax_id *interface)
{
int i;
@ -3594,7 +3593,7 @@ static NTSTATUS rpc_pipe_open_np(struct cli_state *cli,
result->transport_type = NCACN_NP;
result->trans.np.pipe_name = cli_get_pipe_name_from_iface(
result, cli, abstract_syntax);
result, abstract_syntax);
if (result->trans.np.pipe_name == NULL) {
DEBUG(1, ("Could not find pipe for interface\n"));
TALLOC_FREE(result);
@ -3713,7 +3712,7 @@ NTSTATUS cli_rpc_pipe_open_noauth(struct cli_state *cli,
}
DEBUG(lvl, ("cli_rpc_pipe_open_noauth: rpc_pipe_bind for pipe "
"%s failed with error %s\n",
cli_get_pipe_name_from_iface(debug_ctx(), cli,
cli_get_pipe_name_from_iface(debug_ctx(),
interface),
nt_errstr(status) ));
TALLOC_FREE(result);