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>

3 files changed, 44 insertions, 44 deletions

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 8540b59b0b..e3e0dcb4ae 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -41,7 +41,7 @@ extern PRIVS privs[];
 enum lsa_handle_type { LSA_HANDLE_POLICY_TYPE = 1, LSA_HANDLE_ACCOUNT_TYPE };
 
 struct lsa_info {
-	DOM_SID sid;
+	struct dom_sid sid;
 	const char *name;
 	uint32 access;
 	enum lsa_handle_type type;
@@ -83,7 +83,7 @@ const struct generic_mapping lsa_trusted_domain_mapping = {
 static int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx,
 				    struct lsa_RefDomainList *ref,
 				    const char *dom_name,
-				    DOM_SID *dom_sid)
+				    struct dom_sid *dom_sid)
 {
 	int num = 0;
 
@@ -129,7 +129,7 @@ static int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx,
 
 static void init_dom_query_3(struct lsa_DomainInfo *r,
 			     const char *name,
-			     DOM_SID *sid)
+			     struct dom_sid *sid)
 {
 	init_lsa_StringLarge(&r->name, name);
 	r->sid = sid;
@@ -141,7 +141,7 @@ static void init_dom_query_3(struct lsa_DomainInfo *r,
 
 static void init_dom_query_5(struct lsa_DomainInfo *r,
 			     const char *name,
-			     DOM_SID *sid)
+			     struct dom_sid *sid)
 {
 	init_lsa_StringLarge(&r->name, name);
 	r->sid = sid;
@@ -167,7 +167,7 @@ static NTSTATUS lookup_lsa_rids(TALLOC_CTX *mem_ctx,
 	*pmapped_count = 0;
 
 	for (i = 0; i < num_entries; i++) {
-		DOM_SID sid;
+		struct dom_sid sid;
 		uint32 rid;
 		int dom_idx;
 		const char *full_name;
@@ -251,7 +251,7 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
 	*pmapped_count = 0;
 
 	for (i = 0; i < num_entries; i++) {
-		DOM_SID sid;
+		struct dom_sid sid;
 		uint32 rid;
 		int dom_idx;
 		const char *full_name;
@@ -295,7 +295,7 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
 		dom_idx = -1;
 
 		if (type != SID_NAME_UNKNOWN) {
-			DOM_SID domain_sid;
+			struct dom_sid domain_sid;
 			sid_copy(&domain_sid, &sid);
 			sid_split_rid(&domain_sid, &rid);
 			dom_idx = init_lsa_ref_domain_list(mem_ctx, ref, domain, &domain_sid);
@@ -314,9 +314,9 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
 
 static NTSTATUS make_lsa_object_sd(TALLOC_CTX *mem_ctx, struct security_descriptor **sd, size_t *sd_size,
 					const struct generic_mapping *map,
-					DOM_SID *sid, uint32_t sid_access)
+					struct dom_sid *sid, uint32_t sid_access)
 {
-	DOM_SID adm_sid;
+	struct dom_sid adm_sid;
 	struct security_ace ace[5];
 	size_t i = 0;
 
@@ -517,9 +517,9 @@ NTSTATUS _lsa_QueryInfoPolicy(pipes_struct *p,
 {
 	NTSTATUS status = NT_STATUS_OK;
 	struct lsa_info *handle;
-	DOM_SID domain_sid;
+	struct dom_sid domain_sid;
 	const char *name;
-	DOM_SID *sid = NULL;
+	struct dom_sid *sid = NULL;
 	union lsa_PolicyInformation *info = NULL;
 	uint32_t acc_required = 0;
 
@@ -786,7 +786,7 @@ static NTSTATUS _lsa_lookup_sids_internal(pipes_struct *p,
 {
 	NTSTATUS status;
 	int i;
-	const DOM_SID **sids = NULL;
+	const struct dom_sid **sids = NULL;
 	struct lsa_RefDomainList *ref = NULL;
 	uint32 mapped_count = 0;
 	struct lsa_dom_info *dom_infos = NULL;
@@ -801,7 +801,7 @@ static NTSTATUS _lsa_lookup_sids_internal(pipes_struct *p,
 		return NT_STATUS_OK;
 	}
 
-	sids = TALLOC_ARRAY(p->mem_ctx, const DOM_SID *, num_sids);
+	sids = TALLOC_ARRAY(p->mem_ctx, const struct dom_sid *, num_sids);
 	ref = TALLOC_ZERO_P(p->mem_ctx, struct lsa_RefDomainList);
 
 	if (sids == NULL || ref == NULL) {
@@ -1565,7 +1565,7 @@ NTSTATUS _lsa_EnumAccounts(pipes_struct *p,
 			   struct lsa_EnumAccounts *r)
 {
 	struct lsa_info *handle;
-	DOM_SID *sid_list;
+	struct dom_sid *sid_list;
 	int i, j, num_entries;
 	NTSTATUS status;
 	struct lsa_SidPtr *sids = NULL;
@@ -2162,7 +2162,7 @@ NTSTATUS _lsa_AddAccountRights(pipes_struct *p,
 	uint32_t acc_granted = 0;
 	struct security_descriptor *psd = NULL;
 	size_t sd_size;
-	DOM_SID sid;
+	struct dom_sid sid;
 	NTSTATUS status;
 
 	/* find the connection policy handle. */
@@ -2231,7 +2231,7 @@ NTSTATUS _lsa_RemoveAccountRights(pipes_struct *p,
 	int i = 0;
 	struct security_descriptor *psd = NULL;
 	size_t sd_size;
-	DOM_SID sid;
+	struct dom_sid sid;
 	const char *privname = NULL;
 	uint32_t acc_granted = 0;
 	NTSTATUS status;
@@ -2345,7 +2345,7 @@ NTSTATUS _lsa_EnumAccountRights(pipes_struct *p,
 {
 	NTSTATUS status;
 	struct lsa_info *info = NULL;
-	DOM_SID sid;
+	struct dom_sid sid;
 	PRIVILEGE_SET privileges;
 	SE_PRIV mask;
 
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index b5200af819..09b56ed6de 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -75,7 +75,7 @@ struct samr_alias_info {
 };
 
 typedef struct disp_info {
-	DOM_SID sid; /* identify which domain this is. */
+	struct dom_sid sid; /* identify which domain this is. */
 	struct pdb_search *users; /* querydispinfo 1 and 4 */
 	struct pdb_search *machines; /* querydispinfo 2 */
 	struct pdb_search *groups; /* querydispinfo 3 and 5, enumgroups */
@@ -124,9 +124,9 @@ static const struct generic_mapping ali_generic_mapping = {
 
 static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, struct security_descriptor **psd, size_t *sd_size,
                                      const struct generic_mapping *map,
-				     DOM_SID *sid, uint32 sid_access )
+				     struct dom_sid *sid, uint32 sid_access )
 {
-	DOM_SID domadmin_sid;
+	struct dom_sid domadmin_sid;
 	struct security_ace ace[5];		/* at most 5 entries */
 	size_t i = 0;
 
@@ -267,7 +267,7 @@ void map_max_allowed_access(const NT_USER_TOKEN *nt_token,
 
 	/* Full access for DOMAIN\Domain Admins. */
 	if ( IS_DC ) {
-		DOM_SID domadmin_sid;
+		struct dom_sid domadmin_sid;
 		sid_compose(&domadmin_sid, get_global_sam_sid(),
 			    DOMAIN_RID_ADMINS);
 		if (is_sid_in_token(nt_token, &domadmin_sid)) {
@@ -731,7 +731,7 @@ NTSTATUS _samr_SetSecurity(pipes_struct *p,
 /*******************************************************************
   build correct perms based on policies and password times for _samr_query_sec_obj
 *******************************************************************/
-static bool check_change_pw_access(TALLOC_CTX *mem_ctx, DOM_SID *user_sid)
+static bool check_change_pw_access(TALLOC_CTX *mem_ctx, struct dom_sid *user_sid)
 {
 	struct samu *sampass=NULL;
 	bool ret;
@@ -2237,7 +2237,7 @@ NTSTATUS _samr_OpenUser(pipes_struct *p,
 			struct samr_OpenUser *r)
 {
 	struct samu *sampass=NULL;
-	DOM_SID sid;
+	struct dom_sid sid;
 	struct samr_domain_info *dinfo;
 	struct samr_user_info *uinfo;
 	struct security_descriptor *psd = NULL;
@@ -2432,9 +2432,9 @@ static struct samr_LogonHours get_logon_hours_from_pdb(TALLOC_CTX *mem_ctx,
 static NTSTATUS get_user_info_1(TALLOC_CTX *mem_ctx,
 				struct samr_UserInfo1 *r,
 				struct samu *pw,
-				DOM_SID *domain_sid)
+				struct dom_sid *domain_sid)
 {
-	const DOM_SID *sid_group;
+	const struct dom_sid *sid_group;
 	uint32_t primary_gid;
 
 	become_root();
@@ -2481,9 +2481,9 @@ static NTSTATUS get_user_info_2(TALLOC_CTX *mem_ctx,
 static NTSTATUS get_user_info_3(TALLOC_CTX *mem_ctx,
 				struct samr_UserInfo3 *r,
 				struct samu *pw,
-				DOM_SID *domain_sid)
+				struct dom_sid *domain_sid)
 {
-	const DOM_SID *sid_user, *sid_group;
+	const struct dom_sid *sid_user, *sid_group;
 	uint32_t rid, primary_gid;
 
 	sid_user = pdb_get_user_sid(pw);
@@ -2552,9 +2552,9 @@ static NTSTATUS get_user_info_4(TALLOC_CTX *mem_ctx,
 static NTSTATUS get_user_info_5(TALLOC_CTX *mem_ctx,
 				struct samr_UserInfo5 *r,
 				struct samu *pw,
-				DOM_SID *domain_sid)
+				struct dom_sid *domain_sid)
 {
-	const DOM_SID *sid_user, *sid_group;
+	const struct dom_sid *sid_user, *sid_group;
 	uint32_t rid, primary_gid;
 
 	sid_user = pdb_get_user_sid(pw);
@@ -2760,7 +2760,7 @@ static NTSTATUS get_user_info_17(TALLOC_CTX *mem_ctx,
 static NTSTATUS get_user_info_18(pipes_struct *p,
 				 TALLOC_CTX *mem_ctx,
 				 struct samr_UserInfo18 *r,
-				 DOM_SID *user_sid)
+				 struct dom_sid *user_sid)
 {
 	struct samu *smbpass=NULL;
 	bool ret;
@@ -2854,11 +2854,11 @@ static NTSTATUS get_user_info_20(TALLOC_CTX *mem_ctx,
 static NTSTATUS get_user_info_21(TALLOC_CTX *mem_ctx,
 				 struct samr_UserInfo21 *r,
 				 struct samu *pw,
-				 DOM_SID *domain_sid,
+				 struct dom_sid *domain_sid,
 				 uint32_t acc_granted)
 {
 	NTSTATUS status;
-	const DOM_SID *sid_user, *sid_group;
+	const struct dom_sid *sid_user, *sid_group;
 	uint32_t rid, primary_gid;
 	NTTIME force_password_change;
 	time_t must_change_time;
@@ -2971,7 +2971,7 @@ NTSTATUS _samr_QueryUserInfo(pipes_struct *p,
 	NTSTATUS status;
 	union samr_UserInfo *user_info = NULL;
 	struct samr_user_info *uinfo;
-	DOM_SID domain_sid;
+	struct dom_sid domain_sid;
 	uint32 rid;
 	bool ret = false;
 	struct samu *pwd = NULL;
@@ -3188,7 +3188,7 @@ NTSTATUS _samr_GetGroupsForUser(pipes_struct *p,
 {
 	struct samr_user_info *uinfo;
 	struct samu *sam_pass=NULL;
-	DOM_SID *sids;
+	struct dom_sid *sids;
 	struct samr_RidWithAttribute dom_gid;
 	struct samr_RidWithAttribute *gids = NULL;
 	uint32 primary_group_rid;
@@ -3774,7 +3774,7 @@ NTSTATUS _samr_CreateUser2(pipes_struct *p,
 			   struct samr_CreateUser2 *r)
 {
 	const char *account = NULL;
-	DOM_SID sid;
+	struct dom_sid sid;
 	uint32_t acb_info = r->in.acct_flags;
 	struct samr_domain_info *dinfo;
 	struct samr_user_info *uinfo;
@@ -4109,7 +4109,7 @@ NTSTATUS _samr_LookupDomain(pipes_struct *p,
 	NTSTATUS status;
 	struct samr_connect_info *info;
 	const char *domain_name;
-	DOM_SID *sid = NULL;
+	struct dom_sid *sid = NULL;
 
 	/* win9x user manager likes to use SAMR_ACCESS_ENUM_DOMAINS here.
 	   Reverted that change so we will work with RAS servers again */
@@ -4202,7 +4202,7 @@ NTSTATUS _samr_EnumDomains(pipes_struct *p,
 NTSTATUS _samr_OpenAlias(pipes_struct *p,
 			 struct samr_OpenAlias *r)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 	uint32 alias_rid = r->in.rid;
 	struct samr_alias_info *ainfo;
 	struct samr_domain_info *dinfo;
@@ -5345,7 +5345,7 @@ NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
 
 	NTSTATUS status;
 
-	DOM_SID *members;
+	struct dom_sid *members;
 
 	DEBUG(5,("_samr_GetAliasMembership: %d\n", __LINE__));
 
@@ -5362,7 +5362,7 @@ NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
 		return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
 	if (r->in.sids->num_sids) {
-		members = TALLOC_ARRAY(p->mem_ctx, DOM_SID, r->in.sids->num_sids);
+		members = TALLOC_ARRAY(p->mem_ctx, struct dom_sid, r->in.sids->num_sids);
 
 		if (members == NULL)
 			return NT_STATUS_NO_MEMORY;
@@ -5412,7 +5412,7 @@ NTSTATUS _samr_GetMembersInAlias(pipes_struct *p,
 	size_t i;
 	size_t num_sids = 0;
 	struct lsa_SidPtr *sids = NULL;
-	DOM_SID *pdb_sids = NULL;
+	struct dom_sid *pdb_sids = NULL;
 
 	ainfo = policy_handle_find(p, r->in.alias_handle,
 				   SAMR_ALIAS_ACCESS_GET_MEMBERS, NULL,
@@ -5913,7 +5913,7 @@ NTSTATUS _samr_CreateDomainGroup(pipes_struct *p,
 NTSTATUS _samr_CreateDomAlias(pipes_struct *p,
 			      struct samr_CreateDomAlias *r)
 {
-	DOM_SID info_sid;
+	struct dom_sid info_sid;
 	const char *name = NULL;
 	struct samr_domain_info *dinfo;
 	struct samr_alias_info *ainfo;
@@ -6269,7 +6269,7 @@ NTSTATUS _samr_OpenGroup(pipes_struct *p,
 			 struct samr_OpenGroup *r)
 
 {
-	DOM_SID info_sid;
+	struct dom_sid info_sid;
 	GROUP_MAP map;
 	struct samr_domain_info *dinfo;
 	struct samr_group_info *ginfo;
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index b46fc58759..eeae1def3e 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -2293,7 +2293,7 @@ create_default:
 	   this security descriptor has been created when winbindd was
 	   down.  Take ownership of security descriptor. */
 	if (sid_equal(secdesc->owner_sid, &global_sid_World)) {
-		DOM_SID owner_sid;
+		struct dom_sid owner_sid;
 
 		/* Change sd owner to workgroup administrator */
 
@@ -2393,7 +2393,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx,
 	 * descriptor then copy them over from the old one.
 	 */
 	if (!secdesc->owner_sid || !secdesc->group_sid) {
-		DOM_SID *owner_sid, *group_sid;
+		struct dom_sid *owner_sid, *group_sid;
 		struct security_acl *dacl, *sacl;
 		size_t size;