From cba7f8b8273e661d3c43652900d93e5a8eab4e5f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 21 May 2010 11:25:01 +1000 Subject: s3:dom_sid Global replace of DOM_SID with struct dom_sid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- source3/winbindd/idmap_adex/provider_unified.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source3/winbindd/idmap_adex/provider_unified.c') diff --git a/source3/winbindd/idmap_adex/provider_unified.c b/source3/winbindd/idmap_adex/provider_unified.c index af33405747..f66d4dfbf4 100644 --- a/source3/winbindd/idmap_adex/provider_unified.c +++ b/source3/winbindd/idmap_adex/provider_unified.c @@ -35,7 +35,7 @@ struct lwcell_filter enum filterType ftype; bool use2307; union { - DOM_SID sid; + struct dom_sid sid; struct { uint32_t id; enum id_type type; @@ -245,7 +245,7 @@ done: static NTSTATUS search_domain(struct likewise_cell **cell, LDAPMessage **msg, const char *dn, - const DOM_SID *sid) + const struct dom_sid *sid) { NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL; TALLOC_CTX* frame = talloc_stackframe(); @@ -341,7 +341,7 @@ static NTSTATUS check_result_unique_scoped(ADS_STRUCT **ads_list, LDAPMessage **msg_list, int num_resp, char **dn, - DOM_SID *user_sid) + struct dom_sid *user_sid) { NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL; int i; @@ -465,7 +465,7 @@ static NTSTATUS search_forest(struct likewise_cell *forest_cell, LDAPMessage **msg_list = NULL; int num_resp = 0; LDAPMessage *m; - DOM_SID user_sid; + struct dom_sid user_sid; struct likewise_cell *domain_cell = NULL; if ((gc = gc_search_start()) == NULL) { @@ -611,7 +611,7 @@ done: static NTSTATUS pull_sid(struct likewise_cell *c, LDAPMessage *msg, - DOM_SID *sid) + struct dom_sid *sid) { NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL; TALLOC_CTX *frame = talloc_stackframe(); @@ -967,7 +967,7 @@ done: /******************************************************************** *******************************************************************/ -static NTSTATUS _ccp_get_sid_from_id(DOM_SID * sid, +static NTSTATUS _ccp_get_sid_from_id(struct dom_sid * sid, uint32_t id, enum id_type type) { struct likewise_cell *cell = NULL; @@ -996,7 +996,7 @@ done: static NTSTATUS _ccp_get_id_from_sid(uint32_t * id, enum id_type *type, - const DOM_SID * sid) + const struct dom_sid * sid) { struct likewise_cell *cell = NULL; LDAPMessage *msg = NULL; @@ -1026,7 +1026,7 @@ done: /******************************************************************** *******************************************************************/ -static NTSTATUS _ccp_nss_get_info(const DOM_SID * sid, +static NTSTATUS _ccp_nss_get_info(const struct dom_sid * sid, TALLOC_CTX * ctx, const char **homedir, const char **shell, @@ -1071,7 +1071,7 @@ static NTSTATUS _ccp_map_to_alias(TALLOC_CTX *ctx, { TALLOC_CTX *frame = talloc_stackframe(); NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL; - DOM_SID sid; + struct dom_sid sid; struct likewise_cell *cell = NULL; LDAPMessage *msg = NULL; struct lwcell_filter filter; @@ -1116,7 +1116,7 @@ static NTSTATUS _ccp_map_from_alias(TALLOC_CTX *mem_ctx, { TALLOC_CTX *frame = talloc_stackframe(); NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL; - DOM_SID sid; + struct dom_sid sid; struct likewise_cell *cell_alias = NULL; LDAPMessage *msg_alias = NULL; struct likewise_cell *cell_sid = NULL; -- cgit