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, 27 insertions, 27 deletions

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 72e7aeb2fd..875f18c3b3 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -197,8 +197,8 @@ static int smbacl4_fGetFileOwner(files_struct *fsp, SMB_STRUCT_STAT *psbuf)
 }
 
 static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
-	DOM_SID *psid_owner, /* in */
-	DOM_SID *psid_group, /* in */
+	struct dom_sid *psid_owner, /* in */
+	struct dom_sid *psid_group, /* in */
 	bool is_directory, /* in */
 	struct security_ace **ppnt_ace_list, /* out */
 	int *pgood_aces /* out */
@@ -224,7 +224,7 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
 
 	for (aceint=aclint->first; aceint!=NULL; aceint=(SMB_ACE4_INT_T *)aceint->next) {
 		uint32_t mask;
-		DOM_SID sid;
+		struct dom_sid sid;
 		SMB_ACE4PROP_T	*ace = &aceint->prop;
 		uint32_t mapped_ace_flags;
 
@@ -293,7 +293,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
 	struct security_descriptor **ppdesc, SMB4ACL_T *theacl)
 {
 	int	good_aces = 0;
-	DOM_SID sid_owner, sid_group;
+	struct dom_sid sid_owner, sid_group;
 	size_t sd_size = 0;
 	struct security_ace *nt_ace_list = NULL;
 	struct security_acl *psa = NULL;
@@ -481,8 +481,8 @@ static SMB_ACE4PROP_T *smbacl4_find_equal_special(
 	return NULL;
 }
 
-static bool nfs4_map_sid(smbacl4_vfs_params *params, const DOM_SID *src,
-			 DOM_SID *dst)
+static bool nfs4_map_sid(smbacl4_vfs_params *params, const struct dom_sid *src,
+			 struct dom_sid *dst)
 {
 	static struct db_context *mapping_db = NULL;
 	TDB_DATA data;
@@ -573,13 +573,13 @@ static bool smbacl4_fill_ace4(
 		enum lsa_SidType type;
 		uid_t uid;
 		gid_t gid;
-		DOM_SID sid;
+		struct dom_sid sid;
 		
 		sid_copy(&sid, &ace_nt->trustee);
 		
 		if (!lookup_sid(mem_ctx, &sid, &dom, &name, &type)) {
 			
-			DOM_SID mapped;
+			struct dom_sid mapped;
 			
 			if (!nfs4_map_sid(params, &sid, &mapped)) {
 				DEBUG(1, ("nfs4_acls.c: file [%s]: SID %s "
diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c
index 440858b578..3337dea255 100644
--- a/source3/modules/onefs_acl.c
+++ b/source3/modules/onefs_acl.c
@@ -38,7 +38,7 @@ const struct enum_list enum_onefs_acl_wire_format[] = {
  * Turn SID into UID/GID and setup a struct ifs_identity
  */
 static bool
-onefs_sid_to_identity(const DOM_SID *sid, struct ifs_identity *id,
+onefs_sid_to_identity(const struct dom_sid *sid, struct ifs_identity *id,
     bool is_group)
 {
 	enum ifs_identity_type type = IFS_ID_TYPE_LAST+1;
@@ -80,7 +80,7 @@ onefs_sid_to_identity(const DOM_SID *sid, struct ifs_identity *id,
  * Turn struct ifs_identity into SID
  */
 static bool
-onefs_identity_to_sid(struct ifs_identity *id, DOM_SID *sid)
+onefs_identity_to_sid(struct ifs_identity *id, struct dom_sid *sid)
 {
 	if (!id || !sid)
 		return false;
@@ -116,10 +116,10 @@ onefs_identity_to_sid(struct ifs_identity *id, DOM_SID *sid)
 }
 
 static bool
-onefs_og_to_identity(DOM_SID *sid, struct ifs_identity * ident,
+onefs_og_to_identity(struct dom_sid *sid, struct ifs_identity * ident,
     bool is_group, int snum)
 {
-	const DOM_SID *b_admin_sid = &global_sid_Builtin_Administrators;
+	const struct dom_sid *b_admin_sid = &global_sid_Builtin_Administrators;
 
 	if (!onefs_sid_to_identity(sid, ident, is_group)) {
 		if (!lp_parm_bool(snum, PARM_ONEFS_TYPE,
@@ -140,10 +140,10 @@ onefs_og_to_identity(DOM_SID *sid, struct ifs_identity * ident,
 }
 
 static bool
-sid_in_ignore_list(DOM_SID * sid, int snum)
+sid_in_ignore_list(struct dom_sid * sid, int snum)
 {
 	const char ** sid_list = NULL;
-	DOM_SID match;
+	struct dom_sid match;
 
 	sid_list = lp_parm_string_list(snum, PARM_ONEFS_TYPE,
 	    PARM_UNMAPPABLE_SIDS_IGNORE_LIST,
@@ -323,7 +323,7 @@ onefs_acl_to_samba_acl(struct ifs_security_acl *acl, struct security_acl **samba
 	}
 
 	for (i = 0; i < num_aces; i++) {
-		DOM_SID sid;
+		struct dom_sid sid;
 
 		if (!onefs_identity_to_sid(&acl->aces[i].trustee, &sid))
 			goto err_free;
@@ -610,8 +610,8 @@ onefs_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
 	uint32_t sd_size = 0;
 	size_t size = 0;
 	struct ifs_security_descriptor *sd = NULL;
-	DOM_SID owner_sid, group_sid;
-	DOM_SID *ownerp, *groupp;
+	struct dom_sid owner_sid, group_sid;
+	struct dom_sid *ownerp, *groupp;
 	struct security_acl *dacl, *sacl;
 	struct security_descriptor *pdesc;
 	bool alloced = false;
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 64c8ffc22e..1f495d9448 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -30,11 +30,11 @@
 
 #define MAXSIZE 2048
 
-extern const DOM_SID global_sid_World;
-extern const DOM_SID global_sid_Builtin_Administrators;
-extern const DOM_SID global_sid_Builtin_Backup_Operators;
-extern const DOM_SID global_sid_Authenticated_Users;
-extern const DOM_SID global_sid_NULL;
+extern const struct dom_sid global_sid_World;
+extern const struct dom_sid global_sid_Builtin_Administrators;
+extern const struct dom_sid global_sid_Builtin_Backup_Operators;
+extern const struct dom_sid global_sid_Authenticated_Users;
+extern const struct dom_sid global_sid_NULL;
 
 static char space_replacement = '%';
 
@@ -46,7 +46,7 @@ extern int afs_syscall(int, char *, int, char *, int);
 struct afs_ace {
 	bool positive;
 	char *name;
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 	uint32 rights;
 	struct afs_ace *next;
@@ -108,7 +108,7 @@ static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx,
 				   bool positive,
 				   const char *name, uint32 rights)
 {
-	DOM_SID sid;
+	struct dom_sid sid;
 	enum lsa_SidType type;
 	struct afs_ace *result;
 
@@ -591,7 +591,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
 				   struct security_descriptor **ppdesc)
 {
 	struct security_ace *nt_ace_list;
-	DOM_SID owner_sid, group_sid;
+	struct dom_sid owner_sid, group_sid;
 	struct security_acl *psa = NULL;
 	int good_aces;
 	size_t sd_size;
@@ -695,9 +695,9 @@ static size_t afs_fto_nt_acl(struct afs_acl *afs_acl,
 	return afs_to_nt_acl_common(afs_acl, &sbuf, security_info, ppdesc);
 }
 
-static bool mappable_sid(const DOM_SID *sid)
+static bool mappable_sid(const struct dom_sid *sid)
 {
-	DOM_SID domain_sid;
+	struct dom_sid domain_sid;
 	
 	if (sid_compare(sid, &global_sid_Builtin_Administrators) == 0)
 		return True;