Attachment 16839 Details for Bug 14685 – untested and uncompiled :-) patch.

[patch] untested and uncompiled :-) patch.

look (text/plain), 1.06 KB, created by Jeremy Allison on 2021-10-07 18:23:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2021-10-07 18:23:57 UTC

Size: 1.06 KB

patch

obsolete

>diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
>index b04c6e560ad..69a1db59249 100644
>--- a/source3/modules/vfs_zfsacl.c
>+++ b/source3/modules/vfs_zfsacl.c
>@@ -235,13 +235,12 @@ static bool zfs_process_smbacl(vfs_handle_struct *handle, files_struct *fsp,
> 	SMB_ASSERT(i == naces);
> 
> 	/* store acl */
>-	fd = fsp_get_io_fd(fsp);
>-	if (fd != -1) {
>-		rv = facl(fd, ACE_SETACL, naces, acebuf);
>-	}
>-	else {
>-		rv = acl(fsp->fsp_name->base_name, ACE_SETACL, naces, acebuf);
>+	fd = fsp_get_pathref_fd(fsp);
>+	if (fd == -1) {
>+		errno = EBADF;
>+		return false;
> 	}
>+	rv = facl(fd, ACE_SETACL, naces, acebuf);
> 	if (rv != 0) {
> 		if(errno == ENOSYS) {
> 			DEBUG(9, ("acl(ACE_SETACL, %s): Operation is not "
>@@ -322,11 +321,11 @@ static int fget_zfsacl(TALLOC_CTX *mem_ctx,
> 	ace_t *acebuf = NULL;
> 	int fd;
> 
>-	fd = fsp_get_io_fd(fsp);
>+	fd = fsp_get_pathref_fd(fsp);
> 	if (fd == -1) {
>-		return get_zfsacl(mem_ctx, fsp->fsp_name, outbuf);
>+		errno = EBADF;
>+		return -1;
> 	}
>-
> 	naces = facl(fd, ACE_GETACLCNT, 0, NULL);
> 	if (naces == -1) {
> 		int dbg_level = 10;

Actions: View

Attachments on bug 14685: 16839 | 16847