Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 22 Jan 2009 10:37:27 +0000 (11:37 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 22 Jan 2009 10:37:27 +0000 (11:37 +0100)
source3/include/proto.h
source3/rpc_client/cli_pipe.c

index 1445b109147772afc35c058ad55929b3b1166de9..632f820b244556a3d0006b9b8d832e35907fb40a 100644 (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);
index 6e2ffc933b1bbbd5801a1d5606def26a8d5c7f46..bf19160436b417b9fafa004cdc123b47165f5507 100644 (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);