Attachment 7155 Details for Bug 8644 – git-am fix for 3.6.x and 3.5.x.

[patch] git-am fix for 3.6.x and 3.5.x.

0001-Fix-bug-8644-vfs_acl_xattr-and-vfs_acl_tdb-modules-c.patch (text/plain), 1022 bytes, created by Jeremy Allison on 2011-12-02 22:13:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-12-02 22:13:50 UTC

Size: 1022 bytes

patch

obsolete

>From bf3f398b265447f02160ebe4547985c05d7570da Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 2 Dec 2011 10:55:40 -0800
>Subject: [PATCH] Fix bug #8644 - vfs_acl_xattr and vfs_acl_tdb modules can fail to add inheritable entries on a directory with no stored ACL.
>
>If referring to an fsp sbuf can be left as an uninitialized variable,
>causing the 'is_directory' variable to be false when it should be true.
>---
> source3/modules/vfs_acl_common.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
>index 00ac2a1..bf535c5 100644
>--- a/source3/modules/vfs_acl_common.c
>+++ b/source3/modules/vfs_acl_common.c
>@@ -391,7 +391,7 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct *handle,
> 				return map_nt_error_from_unix(errno);
> 			}
> 		}
>-		is_directory = S_ISDIR(sbuf.st_ex_mode);
>+		is_directory = S_ISDIR(psbuf->st_ex_mode);
> 
> 		if (ignore_file_system_acl) {
> 			TALLOC_FREE(pdesc_next);
>-- 
>1.7.3.1
>

Flags:

metze: review+
jra: review? (rsharpe)

Actions: View

Attachments on bug 8644: 7155