Attachment 13234 Details for Bug 12804 – Proposed patch for master.

[patch] Proposed patch for master.

0001-s3-VFS-Catia-Fix-path-name-mixup-when-converting-pat.patch (text/plain), 2.20 KB, created by Jeremy Allison on 2017-05-24 23:25:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-05-24 23:25:45 UTC

Size: 2.20 KB

patch

obsolete

>From 79ffb1fad74840c5dacb474b744c20cd0df58010 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 24 May 2017 11:45:35 -0700
>Subject: [PATCH] s3: VFS: Catia: Fix path/name mixup when converting
> pathnames.
>
>https://bugzilla.samba.org/show_bug.cgi?id=12804
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/modules/vfs_catia.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
>index 9a283710fcb..500109550f0 100644
>--- a/source3/modules/vfs_catia.c
>+++ b/source3/modules/vfs_catia.c
>@@ -1320,14 +1320,14 @@ catia_getxattr(vfs_handle_struct *handle, const char *path,
> 	ssize_t ret;
> 
> 	status = catia_string_replace_allocate(handle->conn,
>-				name, &mapped_name, vfs_translate_to_unix);
>+				path, &mapped_name, vfs_translate_to_unix);
> 	if (!NT_STATUS_IS_OK(status)) {
> 		errno = map_errno_from_nt_status(status);
> 		return -1;
> 	}
> 
> 
>-	ret = SMB_VFS_NEXT_GETXATTR(handle, path, mapped_name, value, size);
>+	ret = SMB_VFS_NEXT_GETXATTR(handle, mapped_name, name, value, size);
> 	TALLOC_FREE(mapped_name);
> 
> 	return ret;
>@@ -1364,14 +1364,14 @@ catia_removexattr(vfs_handle_struct *handle, const char *path,
> 	ssize_t ret;
> 
> 	status = catia_string_replace_allocate(handle->conn,
>-				name, &mapped_name, vfs_translate_to_unix);
>+				path, &mapped_name, vfs_translate_to_unix);
> 	if (!NT_STATUS_IS_OK(status)) {
> 		errno = map_errno_from_nt_status(status);
> 		return -1;
> 	}
> 
> 
>-	ret = SMB_VFS_NEXT_REMOVEXATTR(handle, path, mapped_name);
>+	ret = SMB_VFS_NEXT_REMOVEXATTR(handle, mapped_name, name);
> 	TALLOC_FREE(mapped_name);
> 
> 	return ret;
>@@ -1387,14 +1387,14 @@ catia_setxattr(vfs_handle_struct *handle, const char *path,
> 	ssize_t ret;
> 
> 	status = catia_string_replace_allocate(handle->conn,
>-				name, &mapped_name, vfs_translate_to_unix);
>+				path, &mapped_name, vfs_translate_to_unix);
> 	if (!NT_STATUS_IS_OK(status)) {
> 		errno = map_errno_from_nt_status(status);
> 		return -1;
> 	}
> 
> 
>-	ret = SMB_VFS_NEXT_SETXATTR(handle, path, mapped_name, value, size, flags);
>+	ret = SMB_VFS_NEXT_SETXATTR(handle, mapped_name, name, value, size, flags);
> 	TALLOC_FREE(mapped_name);
> 
> 	return ret;
>-- 
>2.13.0.219.gdb65acc882-goog
>

Actions: View

Attachments on bug 12804: 13234 | 13235 | 13240