Actually complete 3662c2b...

diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index e616a2509f223b44d8470bba6873f0fc9fe91561..d5ef09d831ab5db4435985e21e4a293c563bb236 100644 (file)
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -184,8 +184,7 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
        status = pipe_cm_open(ctx, cli, interface, &result);
        if (!NT_STATUS_IS_OK(status)) {
                libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s",
-                       cli_get_pipe_name_from_iface(debug_ctx(), cli,
-                                                    interface),
+                       cli_get_pipe_name_from_iface(debug_ctx(), interface),
                        get_friendly_nt_error_msg(status));
                return WERR_DEST_NOT_FOUND;
        }

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 7e31862c34bdafa14211370f6293a7e49a660dad..050e78d27485227772f8f4ec475d619770586bbb 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -620,7 +620,7 @@ static NTSTATUS do_cmd(struct cli_state *cli,
                                DEBUG(0, ("Could not initialise %s. Invalid "
                                          "auth type %u\n",
                                          cli_get_pipe_name_from_iface(
-                                                 debug_ctx(), cli,
+                                                 debug_ctx(),
                                                  cmd_entry->interface),
                                          pipe_default_auth_type ));
                                return NT_STATUS_UNSUCCESSFUL;
@@ -628,7 +628,7 @@ static NTSTATUS do_cmd(struct cli_state *cli,
                if (!NT_STATUS_IS_OK(ntresult)) {
                        DEBUG(0, ("Could not initialise %s. Error was %s\n",
                                  cli_get_pipe_name_from_iface(
-                                         debug_ctx(), cli,
+                                         debug_ctx(),
                                          cmd_entry->interface),
                                  nt_errstr(ntresult) ));
                        return ntresult;
@@ -658,7 +658,7 @@ static NTSTATUS do_cmd(struct cli_state *cli,
                        if (!NT_STATUS_IS_OK(ntresult)) {
                                DEBUG(0, ("Could not initialise credentials for %s.\n",
                                          cli_get_pipe_name_from_iface(
-                                                 debug_ctx(), cli,
+                                                 debug_ctx(),
                                                  cmd_entry->interface)));
                                return ntresult;
                        }

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index c000b5809899612bf74ff13c341b6209c26e5f0a..0f59f027462b7d03155a830664af8e1216222842 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -182,7 +182,7 @@ int run_rpc_command(struct net_context *c,
                        if (!NT_STATUS_IS_OK(nt_status)) {
                                DEBUG(0, ("Could not initialise pipe %s. Error was %s\n",
                                        cli_get_pipe_name_from_iface(
-                                               debug_ctx(), cli, interface),
+                                               debug_ctx(), interface),
                                        nt_errstr(nt_status) ));
                                cli_shutdown(cli);
                                return -1;