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>

7 files changed, 25 insertions, 25 deletions

diff --git a/source3/winbindd/idmap_adex/cell_util.c b/source3/winbindd/idmap_adex/cell_util.c
index f5c08a0454..4ca3bf516a 100644
--- a/source3/winbindd/idmap_adex/cell_util.c
+++ b/source3/winbindd/idmap_adex/cell_util.c
@@ -138,7 +138,7 @@ done:
 	ADS_STATUS status;
 	char *domain_dn = ads_build_dn(lp_realm());
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-	DOM_SID sid;
+	struct dom_sid sid;
 	struct likewise_cell *cell = NULL;
 
 	/* In the Likewise plugin, I had to support the concept of cells
diff --git a/source3/winbindd/idmap_adex/domain_util.c b/source3/winbindd/idmap_adex/domain_util.c
index 6851503cc8..dae5415b3b 100644
--- a/source3/winbindd/idmap_adex/domain_util.c
+++ b/source3/winbindd/idmap_adex/domain_util.c
@@ -208,7 +208,7 @@ static struct dc_info *dc_find_domain(const char *dns_domain)
  NTSTATUS dc_search_domains(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();
diff --git a/source3/winbindd/idmap_adex/gc_util.c b/source3/winbindd/idmap_adex/gc_util.c
index 879c2e0ecf..634fd980e8 100644
--- a/source3/winbindd/idmap_adex/gc_util.c
+++ b/source3/winbindd/idmap_adex/gc_util.c
@@ -545,7 +545,7 @@ done:
 
  NTSTATUS gc_name_to_sid(const char *domain,
 			 const char *name,
-			 DOM_SID *sid,
+			 struct dom_sid *sid,
 			 enum lsa_SidType *sid_type)
 {
 	TALLOC_CTX *frame = talloc_stackframe();
@@ -703,7 +703,7 @@ done:
 /*********************************************************************
  ********************************************************************/
 
- NTSTATUS gc_sid_to_name(const DOM_SID *sid,
+ NTSTATUS gc_sid_to_name(const struct dom_sid *sid,
 			 char **name,
 			 enum lsa_SidType *sid_type)
 {
diff --git a/source3/winbindd/idmap_adex/idmap_adex.c b/source3/winbindd/idmap_adex/idmap_adex.c
index 5ca7df0b4a..e5ddfad946 100644
--- a/source3/winbindd/idmap_adex/idmap_adex.c
+++ b/source3/winbindd/idmap_adex/idmap_adex.c
@@ -44,7 +44,7 @@ static NTSTATUS _idmap_adex_init(struct idmap_domain *dom,
 	ADS_STRUCT *ads = NULL;
 	ADS_STATUS status;
 	static NTSTATUS init_status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
-	DOM_SID domain_sid;
+	struct dom_sid domain_sid;
 	fstring dcname;
 	struct sockaddr_storage ip;
 	struct likewise_cell *lwcell;
@@ -314,7 +314,7 @@ static NTSTATUS _nss_adex_init(struct nss_domain_entry
 
 static NTSTATUS _nss_adex_get_info(struct
 				      nss_domain_entry *e,
-				      const DOM_SID * sid,
+				      const struct dom_sid * sid,
 				      TALLOC_CTX * ctx,
 				      ADS_STRUCT * ads,
 				      LDAPMessage * msg,
diff --git a/source3/winbindd/idmap_adex/idmap_adex.h b/source3/winbindd/idmap_adex/idmap_adex.h
index 6d6881e01d..cfb3b807f9 100644
--- a/source3/winbindd/idmap_adex/idmap_adex.h
+++ b/source3/winbindd/idmap_adex/idmap_adex.h
@@ -91,11 +91,11 @@
  */
 
 struct cell_provider_api {
-	NTSTATUS(*get_sid_from_id) (DOM_SID * sid,
+	NTSTATUS(*get_sid_from_id) (struct dom_sid * sid,
 				    uint32_t id, enum id_type type);
 	NTSTATUS(*get_id_from_sid) (uint32_t * id,
-				    enum id_type * type, const DOM_SID * sid);
-	NTSTATUS(*get_nss_info) (const DOM_SID * sid,
+				    enum id_type * type, const struct dom_sid * sid);
+	NTSTATUS(*get_nss_info) (const struct dom_sid * sid,
 				 TALLOC_CTX * ctx,
 				 const char **homedir,
 				 const char **shell,
@@ -122,7 +122,7 @@ struct likewise_cell {
 	struct likewise_cell *prev, *next;
 	ADS_STRUCT *conn;
 	struct likewise_cell *gc_search_cell;
-	DOM_SID domain_sid;
+	struct dom_sid domain_sid;
 	char *dns_domain;
 	char *forest_name;
 	char *dn;
@@ -179,7 +179,7 @@ void cell_set_connection(struct likewise_cell *c,
 void cell_set_dn(struct likewise_cell *c,
 		   const char *dn);
 void cell_set_domain_sid(struct likewise_cell *c,
-			   DOM_SID *sid);
+			   struct dom_sid *sid);
 void cell_set_flags(struct likewise_cell *c, uint32_t flags);
 void cell_clear_flags(struct likewise_cell *c, uint32_t flags);
 
@@ -224,10 +224,10 @@ NTSTATUS gc_search_all_forests_unique(const char *filter,
 
 NTSTATUS gc_name_to_sid(const char *domain,
 			const char *name,
-			DOM_SID *sid,
+			struct dom_sid *sid,
 			enum lsa_SidType *sid_type);
 
-NTSTATUS gc_sid_to_name(const DOM_SID *sid,
+NTSTATUS gc_sid_to_name(const struct dom_sid *sid,
 			char **name,
 			enum lsa_SidType *sid_type);
 
@@ -252,7 +252,7 @@ NTSTATUS domain_init_list(void);
 NTSTATUS dc_search_domains(struct likewise_cell **cell,
 			   LDAPMessage **msg,
 			   const char *dn,
-			   const DOM_SID *user_sid);
+			   const struct dom_sid *user_sid);
 
 
 #endif	/* _IDMAP_ADEX_H */
diff --git a/source3/winbindd/idmap_adex/likewise_cell.c b/source3/winbindd/idmap_adex/likewise_cell.c
index d666d8c01a..f1abb24da2 100644
--- a/source3/winbindd/idmap_adex/likewise_cell.c
+++ b/source3/winbindd/idmap_adex/likewise_cell.c
@@ -176,7 +176,7 @@ static struct likewise_cell *_lw_cell_list = NULL;
 /**********************************************************************
  *********************************************************************/
 
- void cell_set_domain_sid(struct likewise_cell *c, DOM_SID *sid)
+ void cell_set_domain_sid(struct likewise_cell *c, struct dom_sid *sid)
 {
 	sid_copy(&c->domain_sid, sid);
 }
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;