Attachment 1213 Details for Bug 2346 – Proposed patch for jpjanosi@us.ibm.com

[patch] Proposed patch for jpjanosi@us.ibm.com

look (text/plain), 1.15 KB, created by Jeremy Allison on 2005-05-09 17:03:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2005-05-09 17:03:00 UTC

Size: 1.15 KB

patch

obsolete

>Index: smbd/posix_acls.c
>===================================================================
>--- smbd/posix_acls.c	(revision 6685)
>+++ smbd/posix_acls.c	(working copy)
>@@ -1097,13 +1097,28 @@
> 		pace->attr = ALLOW_ACE;
> 
> 		if (setting_acl) {
>+			/* See if the owning user is in any of the other groups in
>+			   the ACE. If so, OR in the permissions from that group. */
>+
>+			BOOL group_matched = False;
>+			canon_ace *pace_iter;
>+
>+			for (pace_iter = *pp_ace; pace_iter; pace_iter = pace_iter->next) {
>+				if (pace_iter->type == SMB_ACL_GROUP_OBJ || pace_iter->type == SMB_ACL_GROUP) {
>+					if (uid_entry_in_group(pace, pace_iter)) {
>+						pace->perms |= pace_iter->perms;
>+						group_matched = True;
>+					}
>+				}
>+			}
>+
> 			/* If we only got an "everyone" perm, just use that. */
>-			if (!got_grp && got_other)
>-				pace->perms = pace_other->perms;
>-			else if (got_grp && uid_entry_in_group(pace, pace_group))
>-				pace->perms = pace_group->perms;
>-			else
>-				pace->perms = 0;
>+			if (!group_matched) {
>+				if (got_other)
>+					pace->perms = pace_other->perms;
>+				else
>+					pace->perms = 0;
>+			}
> 
> 			apply_default_perms(fsp, pace, S_IRUSR);
> 		} else {

Actions: View

Attachments on bug 2346: 1087 | 1119 | 1203 | 1213 | 4130