[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-107-g0e7886a

Jeremy Allison jra at samba.org
Fri Jan 25 02:14:13 GMT 2008


The branch, v3-0-test has been updated
       via  0e7886a3ceb8406c5e331a66c0e6fb6ab4493a3e (commit)
      from  938f78546a4706f25d7b07efbca97a6b2d12d4b9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit 0e7886a3ceb8406c5e331a66c0e6fb6ab4493a3e
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jan 24 18:13:20 2008 -0800

    Fix a really subtle old, old bug :-). When canonicalizing the
    NT ACL into a POSIX one, if the group being set is the primary group
    of the file, map it into a SMB_ACL_GROUP_OBJ, not a SMB_ACL_GROUP.
    Otherwise we get an extra bogus group entry in the POSIX ACL.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/posix_acls.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 636bebf..ee7b05c 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -1336,12 +1336,12 @@ static BOOL create_canon_ace_lists(files_struct *fsp, SMB_STRUCT_STAT *pst,
 
 				psa1->flags |= (psa2->flags & (SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_OBJECT_INHERIT));
 				psa2->flags &= ~(SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_OBJECT_INHERIT);
-				
+
 			} else if (psa2->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
 
 				psa2->flags |= (psa1->flags & (SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_OBJECT_INHERIT));
 				psa1->flags &= ~(SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_OBJECT_INHERIT);
-				
+
 			}
 		}
 	}
@@ -1405,7 +1405,13 @@ static BOOL create_canon_ace_lists(files_struct *fsp, SMB_STRUCT_STAT *pst,
 			current_ace->type = SMB_ACL_USER;
 		} else if (sid_to_gid( &current_ace->trustee, &current_ace->unix_ug.gid)) {
 			current_ace->owner_type = GID_ACE;
-			current_ace->type = SMB_ACL_GROUP;
+			/* If it's the primary group, this is a group_obj, not
+			 * a group. */
+			if (current_ace->unix_ug.gid == pst->st_gid) {
+				current_ace->type = SMB_ACL_GROUP_OBJ;
+			} else {
+				current_ace->type = SMB_ACL_GROUP;
+			}
 		} else {
 			fstring str;
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list