From 3cac5c1bd4d47d143071891a0f21e242a28bd99f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 27 Sep 2019 18:49:33 -0700 Subject: [PATCH] rpcclient: Move rpccli_try_samr_connects() to cmd_samr.c That's the only user, make it static to cmd_samr.c Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/rpc_client/cli_samr.c | 21 --------------------- source3/rpc_client/cli_samr.h | 5 ----- source3/rpcclient/cmd_samr.c | 22 ++++++++++++++++++++++ 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index 452e9593f6a..a3b24e7b164 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -503,25 +503,4 @@ NTSTATUS dcerpc_try_samr_connects(struct dcerpc_binding_handle *h, return status; } -NTSTATUS rpccli_try_samr_connects(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - uint32_t access_mask, - struct policy_handle *connect_pol) -{ - NTSTATUS status; - NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - - status = dcerpc_try_samr_connects(cli->binding_handle, - mem_ctx, - cli->srv_name_slash, - access_mask, - connect_pol, - &result); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - - return result; -} - /* vim: set ts=8 sw=8 noet cindent: */ diff --git a/source3/rpc_client/cli_samr.h b/source3/rpc_client/cli_samr.h index 76993fb7c82..e6f4ee555c8 100644 --- a/source3/rpc_client/cli_samr.h +++ b/source3/rpc_client/cli_samr.h @@ -218,9 +218,4 @@ NTSTATUS dcerpc_try_samr_connects(struct dcerpc_binding_handle *h, struct policy_handle *connect_pol, NTSTATUS *presult); -NTSTATUS rpccli_try_samr_connects(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - uint32_t access_mask, - struct policy_handle *connect_pol); - #endif /* _CLI_SAMR_H */ diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index 0cd8b50058e..f1dc0c2a5e5 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -270,6 +270,28 @@ static void display_sam_info_5(struct samr_DispEntryAscii *r) printf("Account: %s\n", r->account_name.string); } +static NTSTATUS rpccli_try_samr_connects( + struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32_t access_mask, + struct policy_handle *connect_pol) +{ + NTSTATUS status; + NTSTATUS result = NT_STATUS_UNSUCCESSFUL; + + status = dcerpc_try_samr_connects(cli->binding_handle, + mem_ctx, + cli->srv_name_slash, + access_mask, + connect_pol, + &result); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + return result; +} + /**************************************************************************** ****************************************************************************/ -- 2.34.1