Renamed sid field in SEC_ACE to trustee to be more in line with MS's

definitions.
(This used to be commit 9712d3f15a47155f558d0034ef71fd06afb11301)

1 files changed, 23 insertions, 23 deletions

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index d42b11cb83..b00d1810a2 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -38,7 +38,7 @@ typedef struct canon_ace {
 	struct canon_ace *next, *prev;
 	SMB_ACL_TAG_T type;
 	mode_t perms; /* Only use S_I(R|W|X)USR mode bits here. */
-	DOM_SID sid;
+	DOM_SID trustee;
 	enum ace_owner owner_type;
 	enum ace_attribute attr;
 	posix_id unix_ug; 
@@ -103,7 +103,7 @@ static void print_canon_ace(canon_ace *pace, int num)
 	fstring str;
 
 	dbgtext( "canon_ace index %d. Type = %s ", num, pace->attr == ALLOW_ACE ? "allow" : "deny" );
-    dbgtext( "SID = %s ", sid_to_string( str, &pace->sid));
+    dbgtext( "SID = %s ", sid_to_string( str, &pace->trustee));
 	if (pace->owner_type == UID_ACE) {
 		struct passwd *pass = sys_getpwuid(pace->unix_ug.uid);
 		dbgtext( "uid %u (%s) ", (unsigned int)pace->unix_ug.uid, pass ? pass->pw_name : "UNKNOWN");
@@ -243,7 +243,7 @@ static void merge_aces( canon_ace **pp_list_head )
 
 			curr_ace_next = curr_ace->next; /* Save the link in case of delete. */
 
-			if (sid_equal(&curr_ace->sid, &curr_ace_outer->sid) &&
+			if (sid_equal(&curr_ace->trustee, &curr_ace_outer->trustee) &&
 				(curr_ace->attr == curr_ace_outer->attr)) {
 
 				if( DEBUGLVL( 10 )) {
@@ -283,7 +283,7 @@ static void merge_aces( canon_ace **pp_list_head )
 			 * we've put on the ACL, we know the deny must be the first one.
 			 */
 
-			if (sid_equal(&curr_ace->sid, &curr_ace_outer->sid) &&
+			if (sid_equal(&curr_ace->trustee, &curr_ace_outer->trustee) &&
 				(curr_ace_outer->attr == DENY_ACE) && (curr_ace->attr == ALLOW_ACE)) {
 
 				if( DEBUGLVL( 10 )) {
@@ -572,7 +572,7 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
 		pace->type = SMB_ACL_USER_OBJ;
 		pace->owner_type = UID_ACE;
 		pace->unix_ug.uid = pst->st_uid;
-		pace->sid = *pfile_owner_sid;
+		pace->trustee = *pfile_owner_sid;
 		pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IRUSR, S_IWUSR, S_IXUSR);
 		pace->attr = ALLOW_ACE;
 
@@ -589,7 +589,7 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
 		pace->type = SMB_ACL_GROUP_OBJ;
 		pace->owner_type = GID_ACE;
 		pace->unix_ug.uid = pst->st_gid;
-		pace->sid = *pfile_grp_sid;
+		pace->trustee = *pfile_grp_sid;
 		pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IRGRP, S_IWGRP, S_IXGRP);
 		pace->attr = ALLOW_ACE;
 
@@ -606,7 +606,7 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
 		pace->type = SMB_ACL_OTHER;
 		pace->owner_type = WORLD_ACE;
 		pace->unix_ug.world = -1;
-		pace->sid = global_sid_World;
+		pace->trustee = global_sid_World;
 		pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IROTH, S_IWOTH, S_IXOTH);
 		pace->attr = ALLOW_ACE;
 
@@ -688,7 +688,7 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
 			if (psa1->info.mask != psa2->info.mask)
 				continue;
 
-			if (!sid_equal(&psa1->sid, &psa2->sid))
+			if (!sid_equal(&psa1->trustee, &psa2->trustee))
 				continue;
 
 			/*
@@ -718,10 +718,10 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
 		 * Ignore non-mappable SIDs (NT Authority, BUILTIN etc).
 		 */
 
-		if (non_mappable_sid(&psa->sid)) {
+		if (non_mappable_sid(&psa->trustee)) {
 			fstring str;
 			DEBUG(10,("create_canon_ace_lists: ignoring non-mappable SID %s\n",
-				sid_to_string(str, &psa->sid) ));
+				sid_to_string(str, &psa->trustee) ));
 			continue;
 		}
 
@@ -738,19 +738,19 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
 
 		ZERO_STRUCTP(current_ace);
 
-		sid_copy(&current_ace->sid, &psa->sid);
+		sid_copy(&current_ace->trustee, &psa->trustee);
 
 		/*
 		 * Try and work out if the SID is a user or group
 		 * as we need to flag these differently for POSIX.
 		 */
 
-		if( sid_equal(&current_ace->sid, &global_sid_World)) {
+		if( sid_equal(&current_ace->trustee, &global_sid_World)) {
 			current_ace->owner_type = WORLD_ACE;
 			current_ace->unix_ug.world = -1;
-		} else if (sid_to_uid( &current_ace->sid, &current_ace->unix_ug.uid, &sid_type)) {
+		} else if (sid_to_uid( &current_ace->trustee, &current_ace->unix_ug.uid, &sid_type)) {
 			current_ace->owner_type = UID_ACE;
-		} else if (sid_to_gid( &current_ace->sid, &current_ace->unix_ug.gid, &sid_type)) {
+		} else if (sid_to_gid( &current_ace->trustee, &current_ace->unix_ug.gid, &sid_type)) {
 			current_ace->owner_type = GID_ACE;
 		} else {
 			fstring str;
@@ -759,7 +759,7 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
 			free_canon_ace_list(dir_ace);
 			SAFE_FREE(current_ace);
 			DEBUG(0,("create_canon_ace_lists: unable to map SID %s to uid or gid.\n",
-				sid_to_string(str, &current_ace->sid) ));
+				sid_to_string(str, &current_ace->trustee) ));
 			return False;
 		}
 
@@ -775,15 +775,15 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
 		 * Now note what kind of a POSIX ACL this should map to.
 		 */
 
-		if(sid_equal(&current_ace->sid, pfile_owner_sid)) {
+		if(sid_equal(&current_ace->trustee, pfile_owner_sid)) {
 
 			current_ace->type = SMB_ACL_USER_OBJ;
 
-		} else if( sid_equal(&current_ace->sid, pfile_grp_sid)) {
+		} else if( sid_equal(&current_ace->trustee, pfile_grp_sid)) {
 
 			current_ace->type = SMB_ACL_GROUP_OBJ;
 
-		} else if( sid_equal(&current_ace->sid, &global_sid_World)) {
+		} else if( sid_equal(&current_ace->trustee, &global_sid_World)) {
 
 			current_ace->type = SMB_ACL_OTHER;
 
@@ -930,7 +930,7 @@ static BOOL uid_entry_in_group( canon_ace *uid_ace, canon_ace *group_ace )
 
 	/* "Everyone" always matches every uid. */
 
-	if (sid_equal(&group_ace->sid, &global_sid_World))
+	if (sid_equal(&group_ace->trustee, &global_sid_World))
 		return True;
 
 	if (!(pass = sys_getpwuid(uid_ace->unix_ug.uid)))
@@ -1067,7 +1067,7 @@ static void process_deny_list( canon_ace **pp_ace_list )
 			continue;
 		}
 
-		if (!sid_equal(&curr_ace->sid, &global_sid_World))
+		if (!sid_equal(&curr_ace->trustee, &global_sid_World))
 			continue;
 
 		/* JRATEST - assert. */
@@ -1518,7 +1518,7 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
 		ace->type = tagtype;
 		ace->perms = convert_permset_to_mode_t(permset);
 		ace->attr = ALLOW_ACE;
-		ace->sid = sid;
+		ace->trustee = sid;
 		ace->unix_ug = unix_ug;
 		ace->owner_type = owner_type;
 
@@ -1937,14 +1937,14 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
 
 		for (i = 0; i < num_acls; i++, ace = ace->next) {
 			SEC_ACCESS acc = map_canon_ace_perms(&nt_acl_type, &owner_sid, ace );
-			init_sec_ace(&nt_ace_list[num_aces++], &ace->sid, nt_acl_type, acc, 0);
+			init_sec_ace(&nt_ace_list[num_aces++], &ace->trustee, nt_acl_type, acc, 0);
 		}
 
 		ace = dir_ace;
 
 		for (i = 0; i < num_dir_acls; i++, ace = ace->next) {
 			SEC_ACCESS acc = map_canon_ace_perms(&nt_acl_type, &owner_sid, ace );
-			init_sec_ace(&nt_ace_list[num_aces++], &ace->sid, nt_acl_type, acc, 
+			init_sec_ace(&nt_ace_list[num_aces++], &ace->trustee, nt_acl_type, acc, 
 					SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_INHERIT_ONLY);
 		}