Attachment 16619 Details for Bug 14708 – git-am fix for 4.14.next, 4.13.next.

[patch] git-am fix for 4.14.next, 4.13.next.

0001-s3-smbd-Ensure-POSIX-default-ACL-is-mapped-into-retu.patch (text/plain), 1.84 KB, created by Jeremy Allison on 2021-05-19 17:21:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2021-05-19 17:21:25 UTC

Size: 1.84 KB

patch

obsolete

>From 10ce93d0e419ca002ea7d88a1b364e972c99a033 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Mon, 17 May 2021 15:34:55 -0700
>Subject: [PATCH] s3: smbd: Ensure POSIX default ACL is mapped into returned
> Windows ACL for directory handles.
>
>Remove knownfail.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14708
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Noel Power <npower@samba.org>
>
>Autobuild-User(master): Noel Power <npower@samba.org>
>Autobuild-Date(master): Wed May 19 09:22:56 UTC 2021 on sn-devel-184
>
>(cherry picked from commit b7f62e13933da14c381f70cd46ad13849b108e68)
>---
> source3/smbd/posix_acls.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
>diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
>index c1d5b7cd047..473223ea133 100644
>--- a/source3/smbd/posix_acls.c
>+++ b/source3/smbd/posix_acls.c
>@@ -3432,6 +3432,7 @@ NTSTATUS posix_fget_nt_acl(struct files_struct *fsp, uint32_t security_info,
> {
> 	SMB_STRUCT_STAT sbuf;
> 	SMB_ACL_T posix_acl = NULL;
>+	SMB_ACL_T def_acl = NULL;
> 	struct pai_val *pal;
> 	TALLOC_CTX *frame = talloc_stackframe();
> 	NTSTATUS status;
>@@ -3450,10 +3451,19 @@ NTSTATUS posix_fget_nt_acl(struct files_struct *fsp, uint32_t security_info,
> 	/* Get the ACL from the fd. */
> 	posix_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, frame);
> 
>+	/* If it's a directory get the default POSIX ACL. */
>+	if(fsp->fsp_flags.is_directory) {
>+		def_acl = SMB_VFS_SYS_ACL_GET_FILE(fsp->conn,
>+						   fsp->fsp_name,
>+						   SMB_ACL_TYPE_DEFAULT,
>+						   frame);
>+		def_acl = free_empty_sys_acl(fsp->conn, def_acl);
>+	}
>+
> 	pal = fload_inherited_info(fsp);
> 
> 	status = posix_get_nt_acl_common(fsp->conn, fsp->fsp_name->base_name,
>-					 &sbuf, pal, posix_acl, NULL,
>+					 &sbuf, pal, posix_acl, def_acl,
> 					 security_info, mem_ctx, ppdesc);
> 	TALLOC_FREE(frame);
> 	return status;
>-- 
>2.27.0
>

Flags:

npower: review+
jra: review? (slow)

Actions: View

Attachments on bug 14708: 16608 | 16613 | 16619