From a94e278883c58b35d383753e86135ff6a1d14ec7 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 8 Aug 2013 17:40:22 +0200 Subject: s3-rpc: use table->name directly in DEBUG contexts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guenther Signed-off-by: Günther Deschner Reviewed-by: Stefan Metzmacher --- source3/lib/netapi/cm.c | 2 +- source3/rpc_client/cli_pipe.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 1cfdccfd1d..bb5d6b234a 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -254,7 +254,7 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx, status = pipe_cm_open(ctx, ipc, table, &result); if (!NT_STATUS_IS_OK(status)) { libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s", - get_pipe_name_from_syntax(talloc_tos(), &table->syntax_id), + table->name, get_friendly_nt_error_msg(status)); return WERR_DEST_NOT_FOUND; } diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 1376973b10..e7e8610c2a 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -2664,8 +2664,7 @@ NTSTATUS cli_rpc_pipe_open_noauth_transport(struct cli_state *cli, } DEBUG(lvl, ("cli_rpc_pipe_open_noauth: rpc_pipe_bind for pipe " "%s failed with error %s\n", - get_pipe_name_from_syntax(talloc_tos(), - &table->syntax_id), + table->name, nt_errstr(status) )); TALLOC_FREE(result); return status; @@ -2673,7 +2672,7 @@ NTSTATUS cli_rpc_pipe_open_noauth_transport(struct cli_state *cli, DEBUG(10,("cli_rpc_pipe_open_noauth: opened pipe %s to machine " "%s and bound anonymously.\n", - get_pipe_name_from_syntax(talloc_tos(), &table->syntax_id), + table->name, result->desthost)); *presult = result; @@ -2918,7 +2917,7 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli, done: DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to machine %s " "for domain %s and bound using schannel.\n", - get_pipe_name_from_syntax(talloc_tos(), &table->syntax_id), + table->name, rpccli->desthost, domain)); *_rpccli = rpccli; -- cgit