Attachment 6018 Details for Bug 7734 – git am fix for 3.5.next.

[patch] git am fix for 3.5.next.

0001-Fix-bug-7734-When-creating-files-with-inherit-ACLs-s.patch (text/plain), 1.51 KB, created by Jeremy Allison on 2010-10-18 15:38:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-10-18 15:38:07 UTC

Size: 1.51 KB

patch

obsolete

>From 71499feecf2d2aca97986ca0ff73a0942bd03cec Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 15 Oct 2010 14:12:04 -0700
>Subject: [PATCH] Fix bug #7734 - When creating files with "inherit ACLs" set to true, we neglect to apply appropriate create masks.
>
>Jeremy.
>(cherry picked from commit 8cad5e23b6e2440a566def6fb138d484e3b47643)
>---
> source3/modules/vfs_default.c |    2 +-
> source3/smbd/open.c           |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
>index 6e2a571..691fd7c 100644
>--- a/source3/modules/vfs_default.c
>+++ b/source3/modules/vfs_default.c
>@@ -217,7 +217,7 @@ static int vfswrap_mkdir(vfs_handle_struct *handle,  const char *path, mode_t mo
> 	if (lp_inherit_acls(SNUM(handle->conn))
> 	    && parent_dirname(talloc_tos(), path, &parent, NULL)
> 	    && (has_dacl = directory_has_default_acl(handle->conn, parent)))
>-		mode = 0777;
>+		mode = (0777 & lp_dir_mask(SNUM(handle->conn)));
> 
> 	TALLOC_FREE(parent);
> 
>diff --git a/source3/smbd/open.c b/source3/smbd/open.c
>index fa64754..4b36f54 100644
>--- a/source3/smbd/open.c
>+++ b/source3/smbd/open.c
>@@ -1966,7 +1966,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
> 
>         if ((flags2 & O_CREAT) && lp_inherit_acls(SNUM(conn)) &&
> 	    (def_acl = directory_has_default_acl(conn, parent_dir))) {
>-		unx_mode = 0777;
>+		unx_mode = (0777 & lp_create_mask(SNUM(conn)));
> 	}
> 
> 	DEBUG(4,("calling open_file with flags=0x%X flags2=0x%X mode=0%o, "
>-- 
>1.7.1
>

Flags:

vl: review+

Actions: View

Attachments on bug 7734: 6018