From 2e07c2ade89f4ff281c61f74cb88e09990cf5f46 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 15 Dec 2007 22:47:30 +0100 Subject: s/sid_to_string/sid_to_fstring/ least surprise for callers (This used to be commit eb523ba77697346a365589101aac379febecd546) --- source3/rpcclient/cmd_lsarpc.c | 10 +++++----- source3/rpcclient/cmd_netlogon.c | 2 +- source3/rpcclient/cmd_samr.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/rpcclient') diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c index 61495075c1..d54f67264a 100644 --- a/source3/rpcclient/cmd_lsarpc.c +++ b/source3/rpcclient/cmd_lsarpc.c @@ -251,7 +251,7 @@ static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli, for (i = 0; i < (argc - 1); i++) { fstring sid_str; - sid_to_string(sid_str, &sids[i]); + sid_to_fstring(sid_str, &sids[i]); printf("%s %s (%s: %d)\n", argv[i + 1], sid_str, sid_type_lookup(types[i]), types[i]); } @@ -301,7 +301,7 @@ static NTSTATUS cmd_lsa_lookup_names_level(struct rpc_pipe_client *cli, for (i = 0; i < (argc - 2); i++) { fstring sid_str; - sid_to_string(sid_str, &sids[i]); + sid_to_fstring(sid_str, &sids[i]); printf("%s %s (%s: %d)\n", argv[i + 2], sid_str, sid_type_lookup(types[i]), types[i]); } @@ -369,7 +369,7 @@ static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem for (i = 0; i < (argc - 1); i++) { fstring sid_str; - sid_to_string(sid_str, &sids[i]); + sid_to_fstring(sid_str, &sids[i]); printf("%s %s\\%s (%d)\n", sid_str, domains[i] ? domains[i] : "*unknown*", names[i] ? names[i] : "*unknown*", types[i]); @@ -432,7 +432,7 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct rpc_pipe_client *cli, for (i = 0; i < num_domains; i++) { fstring sid_str; - sid_to_string(sid_str, &domain_sids[i]); + sid_to_fstring(sid_str, &domain_sids[i]); printf("%s %s\n", domain_names[i] ? domain_names[i] : "*unknown*", sid_str); } @@ -581,7 +581,7 @@ static NTSTATUS cmd_lsa_enum_sids(struct rpc_pipe_client *cli, for (i = 0; i < count; i++) { fstring sid_str; - sid_to_string(sid_str, &sids[i]); + sid_to_fstring(sid_str, &sids[i]); printf("%s\n", sid_str); } diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c index 6acac8273c..e997bb5090 100644 --- a/source3/rpcclient/cmd_netlogon.c +++ b/source3/rpcclient/cmd_netlogon.c @@ -365,7 +365,7 @@ static void display_sam_sync(uint32 num_deltas, SAM_DELTA_HDR *hdr_deltas, for (j = 0; j < alias->num_members; j++) { fstring sid_str; - sid_to_string(sid_str, &alias->sids[j].sid); + sid_to_fstring(sid_str, &alias->sids[j].sid); printf("%s\n", sid_str); } diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index 6a3c92a16a..dae6c42bf2 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -1118,7 +1118,7 @@ static NTSTATUS cmd_samr_query_aliasmem(struct rpc_pipe_client *cli, for (i = 0; i < num_members; i++) { fstring sid_str; - sid_to_string(sid_str, &alias_sids[i]); + sid_to_fstring(sid_str, &alias_sids[i]); printf("\tsid:[%s]\n", sid_str); } @@ -2114,7 +2114,7 @@ static NTSTATUS cmd_samr_lookup_domain(struct rpc_pipe_client *cli, result = rpccli_samr_lookup_domain( cli, mem_ctx, &connect_pol, domain_name, &sid); - sid_to_string(sid_string,&sid); + sid_to_fstring(sid_string,&sid); if (NT_STATUS_IS_OK(result)) printf("SAMR_LOOKUP_DOMAIN: Domain Name: %s Domain SID: %s\n", -- cgit