Attachment 3121 Details for Bug 4929 – Second part of the patch.

[patch] Second part of the patch.

look1 (text/plain), 1.05 KB, created by Jeremy Allison on 2008-01-24 15:04:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2008-01-24 15:04:13 UTC

Size: 1.05 KB

patch

obsolete

>diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
>index 323d6ca..40979cd 100644
>--- a/source/smbd/posix_acls.c
>+++ b/source/smbd/posix_acls.c
>@@ -3293,20 +3293,15 @@ static NTSTATUS append_parent_acl(files_struct *fsp,
> 	/* Finally append any inherited ACEs. */
> 	for (j = 0; j < parent_sd->dacl->num_aces; j++) {
> 		SEC_ACE *se = &parent_sd->dacl->aces[j];
>-		uint32 i_flags = se->flags & (SEC_ACE_FLAG_OBJECT_INHERIT|
>-					SEC_ACE_FLAG_CONTAINER_INHERIT|
>-					SEC_ACE_FLAG_INHERIT_ONLY);
> 
> 		if (fsp->is_directory) {
>-			if (i_flags == SEC_ACE_FLAG_OBJECT_INHERIT) {
>-				/* Should only apply to a file - ignore. */
>+			if (!(se->flags & SEC_ACE_FLAG_CONTAINER_INHERIT)) {
>+				/* Doesn't apply to a directory - ignore. */
> 				continue;
> 			}
> 		} else {
>-			if ((i_flags & (SEC_ACE_FLAG_OBJECT_INHERIT|
>-					SEC_ACE_FLAG_INHERIT_ONLY)) !=
>-					SEC_ACE_FLAG_OBJECT_INHERIT) {
>-				/* Should not apply to a file - ignore. */
>+			if (!(se->flags & SEC_ACE_FLAG_OBJECT_INHERIT)) {
>+				/* Doesn't apply to a file - ignore. */
> 				continue;
> 			}
> 		}

Actions: View

Attachments on bug 4929: 2900 | 2901 | 2902 | 3118 | 3119 | 3120 | 3121