summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-22 11:37:27 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-22 11:37:27 +0100
commit8f68a716fdefb153811d7d930fdd73df9963246a (patch)
tree0bb678410d2057e55cf38a2ab66295f5a51199af /source3
parente490c1b8c858ea42e31ae1a6504c4788e0fb1545 (diff)
parent3662c2b0f648d1719cbb26f9abfc61dbe03f8a2a (diff)
downloadsamba-8f68a716fdefb153811d7d930fdd73df9963246a.tar.gz
samba-8f68a716fdefb153811d7d930fdd73df9963246a.tar.bz2
samba-8f68a716fdefb153811d7d930fdd73df9963246a.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/rpc_client/cli_pipe.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1445b10914..632f820b24 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -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);
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 6e2ffc933b..bf19160436 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -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);