diff options
author | Andrew Bartlett <abartlet@samba.org> | 2010-05-21 11:25:01 +1000 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2010-05-21 10:39:59 +0200 |
commit | cba7f8b8273e661d3c43652900d93e5a8eab4e5f (patch) | |
tree | 714e00240ddc0c7e689240d2c8fb7d9196b1fff2 /source3/rpc_client | |
parent | a92b653af964364ee438c6ee69a87eb7603ceab0 (diff) | |
download | samba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.tar.gz samba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.tar.xz samba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.zip |
s3:dom_sid Global replace of DOM_SID with struct dom_sid
This matches the structure that new code is being written to,
and removes one more of the old-style named structures, and
the need to know that is is just an alias for struct dom_sid.
Andrew Bartlett
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/rpc_client')
-rw-r--r-- | source3/rpc_client/cli_lsarpc.c | 20 | ||||
-rw-r--r-- | source3/rpc_client/cli_lsarpc.h | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c index 481b65b80a..649200a967 100644 --- a/source3/rpc_client/cli_lsarpc.c +++ b/source3/rpc_client/cli_lsarpc.c @@ -113,7 +113,7 @@ static NTSTATUS rpccli_lsa_lookup_sids_noalloc(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *pol, int num_sids, - const DOM_SID *sids, + const struct dom_sid *sids, char **domains, char **names, enum lsa_SidType *types, @@ -271,7 +271,7 @@ static NTSTATUS rpccli_lsa_lookup_sids_generic(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *pol, int num_sids, - const DOM_SID *sids, + const struct dom_sid *sids, char ***pdomains, char ***pnames, enum lsa_SidType **ptypes, @@ -280,7 +280,7 @@ static NTSTATUS rpccli_lsa_lookup_sids_generic(struct rpc_pipe_client *cli, NTSTATUS result = NT_STATUS_OK; int sids_left = 0; int sids_processed = 0; - const DOM_SID *hunk_sids = sids; + const struct dom_sid *hunk_sids = sids; char **hunk_domains; char **hunk_names; enum lsa_SidType *hunk_types; @@ -380,7 +380,7 @@ NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *pol, int num_sids, - const DOM_SID *sids, + const struct dom_sid *sids, char ***pdomains, char ***pnames, enum lsa_SidType **ptypes) @@ -393,7 +393,7 @@ NTSTATUS rpccli_lsa_lookup_sids3(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *pol, int num_sids, - const DOM_SID *sids, + const struct dom_sid *sids, char ***pdomains, char ***pnames, enum lsa_SidType **ptypes) @@ -410,7 +410,7 @@ static NTSTATUS rpccli_lsa_lookup_names_generic(struct rpc_pipe_client *cli, const char **names, const char ***dom_names, int level, - DOM_SID **sids, + struct dom_sid **sids, enum lsa_SidType **types, bool use_lookupnames4) { @@ -471,7 +471,7 @@ static NTSTATUS rpccli_lsa_lookup_names_generic(struct rpc_pipe_client *cli, } if (num_names) { - if (!((*sids = TALLOC_ARRAY(mem_ctx, DOM_SID, num_names)))) { + if (!((*sids = TALLOC_ARRAY(mem_ctx, struct dom_sid, num_names)))) { DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n")); result = NT_STATUS_NO_MEMORY; goto done; @@ -501,7 +501,7 @@ static NTSTATUS rpccli_lsa_lookup_names_generic(struct rpc_pipe_client *cli, for (i = 0; i < num_names; i++) { uint32_t dom_idx; - DOM_SID *sid = &(*sids)[i]; + struct dom_sid *sid = &(*sids)[i]; if (use_lookupnames4) { dom_idx = sid_array3.sids[i].sid_index; @@ -548,7 +548,7 @@ NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client *cli, const char **names, const char ***dom_names, int level, - DOM_SID **sids, + struct dom_sid **sids, enum lsa_SidType **types) { return rpccli_lsa_lookup_names_generic(cli, mem_ctx, pol, num_names, @@ -562,7 +562,7 @@ NTSTATUS rpccli_lsa_lookup_names4(struct rpc_pipe_client *cli, const char **names, const char ***dom_names, int level, - DOM_SID **sids, + struct dom_sid **sids, enum lsa_SidType **types) { return rpccli_lsa_lookup_names_generic(cli, mem_ctx, pol, num_names, diff --git a/source3/rpc_client/cli_lsarpc.h b/source3/rpc_client/cli_lsarpc.h index 188e5063d3..d971ee9b58 100644 --- a/source3/rpc_client/cli_lsarpc.h +++ b/source3/rpc_client/cli_lsarpc.h @@ -11,7 +11,7 @@ NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *pol, int num_sids, - const DOM_SID *sids, + const struct dom_sid *sids, char ***pdomains, char ***pnames, enum lsa_SidType **ptypes); @@ -19,7 +19,7 @@ NTSTATUS rpccli_lsa_lookup_sids3(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *pol, int num_sids, - const DOM_SID *sids, + const struct dom_sid *sids, char ***pdomains, char ***pnames, enum lsa_SidType **ptypes); @@ -29,7 +29,7 @@ NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client *cli, const char **names, const char ***dom_names, int level, - DOM_SID **sids, + struct dom_sid **sids, enum lsa_SidType **types); NTSTATUS rpccli_lsa_lookup_names4(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, @@ -37,8 +37,8 @@ NTSTATUS rpccli_lsa_lookup_names4(struct rpc_pipe_client *cli, const char **names, const char ***dom_names, int level, - DOM_SID **sids, + struct dom_sid **sids, enum lsa_SidType **types); -bool fetch_domain_sid( char *domain, char *remote_machine, DOM_SID *psid); +bool fetch_domain_sid( char *domain, char *remote_machine, struct dom_sid *psid); |