From 05ba38f7549f91670761928f1c959b65eb4bcec1 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 20 Sep 2006 22:49:02 +0000 Subject: r18747: replace rpccli_lsa_close() with rpccli_lsa_Close() (This used to be commit 50d74ce0488a9bd0980cdc6d523a210f6238ef74) --- source3/utils/net_domain.c | 2 +- source3/utils/net_rpc.c | 12 ++++++------ source3/utils/net_rpc_join.c | 2 +- source3/utils/net_rpc_rights.c | 10 +++++----- source3/utils/net_util.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/net_domain.c b/source3/utils/net_domain.c index a4a52b2384..ab71d35fde 100644 --- a/source3/utils/net_domain.c +++ b/source3/utils/net_domain.c @@ -180,7 +180,7 @@ NTSTATUS netdom_get_domain_sid( TALLOC_CTX *mem_ctx, struct cli_state *cli, DOM_ if ( !NT_STATUS_IS_OK(status) ) return status; - rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol); + rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol); cli_rpc_pipe_close(pipe_hnd); /* Done with this pipe */ /* Bail out if domain didn't get set. */ diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index cb426959c3..766dd43faa 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -81,7 +81,7 @@ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx, return result; } - rpccli_lsa_close(lsa_pipe, mem_ctx, &pol); + rpccli_lsa_Close(lsa_pipe, mem_ctx, &pol); cli_rpc_pipe_close(lsa_pipe); return NT_STATUS_OK; @@ -2036,7 +2036,7 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli, *type = types[0]; } - rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol); + rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol); done: if (pipe_hnd) { @@ -4109,7 +4109,7 @@ static NTSTATUS rpc_aliaslist_dump(const DOM_SID *domain_sid, DEBUG(1, ("\n")); } - rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol); + rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol); return NT_STATUS_OK; } @@ -5722,7 +5722,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) * Close the pipes and clean up */ - nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd); + nt_status = rpccli_lsa_Close(pipe_hnd, mem_ctx, &connect_hnd); if (NT_STATUS_IS_ERR(nt_status)) { DEBUG(0, ("Couldn't close LSA pipe. Error was %s\n", nt_errstr(nt_status))); @@ -5984,7 +5984,7 @@ static int rpc_trustdom_vampire(int argc, const char **argv) } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES)); /* close this connection before doing next one */ - nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd); + nt_status = rpccli_lsa_Close(pipe_hnd, mem_ctx, &connect_hnd); if (NT_STATUS_IS_ERR(nt_status)) { DEBUG(0, ("Couldn't properly close lsa policy handle. Error was %s\n", nt_errstr(nt_status))); @@ -6108,7 +6108,7 @@ static int rpc_trustdom_list(int argc, const char **argv) } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES)); /* close this connection before doing next one */ - nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd); + nt_status = rpccli_lsa_Close(pipe_hnd, mem_ctx, &connect_hnd); if (NT_STATUS_IS_ERR(nt_status)) { DEBUG(0, ("Couldn't properly close lsa policy handle. Error was %s\n", nt_errstr(nt_status))); diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index d23bd76751..ba3c619012 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -193,7 +193,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) 5, &domain, &domain_sid), "error querying info policy"); - rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol); + rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol); cli_rpc_pipe_close(pipe_hnd); /* Done with this pipe */ /* Bail out if domain didn't get set. */ diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c index 11c4991e7d..5c999e4cb0 100644 --- a/source3/utils/net_rpc_rights.c +++ b/source3/utils/net_rpc_rights.c @@ -48,7 +48,7 @@ static NTSTATUS sid_to_name(struct rpc_pipe_client *pipe_hnd, fstrcpy( name, names[0] ); } - rpccli_lsa_close(pipe_hnd, mem_ctx, &pol); + rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol); return result; } @@ -81,7 +81,7 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *pipe_hnd, if ( NT_STATUS_IS_OK(result) ) sid_copy( sid, &sids[0] ); - rpccli_lsa_close(pipe_hnd, mem_ctx, &pol); + rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol); return result; } @@ -391,7 +391,7 @@ static NTSTATUS rpc_rights_list_internal(const DOM_SID *domain_sid, result = enum_privileges_for_user(pipe_hnd, mem_ctx, &pol, &sid ); done: - rpccli_lsa_close(pipe_hnd, mem_ctx, &pol); + rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol); return result; } @@ -442,7 +442,7 @@ static NTSTATUS rpc_rights_grant_internal(const DOM_SID *domain_sid, argv[0], nt_errstr(result)); } - rpccli_lsa_close(pipe_hnd, mem_ctx, &dom_pol); + rpccli_lsa_Close(pipe_hnd, mem_ctx, &dom_pol); return result; } @@ -493,7 +493,7 @@ done: argv[0], nt_errstr(result)); } - rpccli_lsa_close(pipe_hnd, mem_ctx, &dom_pol); + rpccli_lsa_Close(pipe_hnd, mem_ctx, &dom_pol); return result; } diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c index be39a75465..db6420d6b7 100644 --- a/source3/utils/net_util.c +++ b/source3/utils/net_util.c @@ -81,7 +81,7 @@ NTSTATUS net_rpc_lookup_name(TALLOC_CTX *mem_ctx, struct cli_state *cli, done: if (is_valid_policy_hnd(&pol)) { - rpccli_lsa_close(lsa_pipe, mem_ctx, &pol); + rpccli_lsa_Close(lsa_pipe, mem_ctx, &pol); } cli_rpc_pipe_close(lsa_pipe); -- cgit