Attachment 8613 Details for Bug 9701 – the REAL patch

[patch] the REAL patch

0002-vfs_catia-fix-the-translation-to-vfs_translate_to_wi.patch (text/plain), 1.74 KB, created by Guenter Kukkukk on 2013-03-06 04:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenter Kukkukk

Created: 2013-03-06 04:50:03 UTC

Size: 1.74 KB

patch

obsolete

>From 9d0a3972b1ec8e0185d8635d644201ad3f16ea71 Mon Sep 17 00:00:00 2001
>From: Guenter Kukkukk <kukks@samba.org>
>Date: Wed, 27 Feb 2013 05:50:52 +0100
>Subject: [PATCH 2/5] vfs_catia: fix the translation to "vfs_translate_to_windows"
>
>THANKS to an IRC user (Raimund ?) who asked for a char mapping possibility.
>I suggested vfs_catia - but it did not work!
>Hopefully now it will. :-)
>
>Signed-off-by: Guenter Kukkukk <kukks@samba.org>
>---
> source3/modules/vfs_catia.c |   10 ++++++----
> 1 files changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
>index 617079b..ed89d39 100644
>--- a/source3/modules/vfs_catia.c
>+++ b/source3/modules/vfs_catia.c
>@@ -300,7 +300,7 @@ static NTSTATUS catia_translate_name(struct vfs_handle_struct *handle,
> {
> 	char *name = NULL;
> 	char *mapped_name;
>-	NTSTATUS ret;
>+	NTSTATUS status, ret;
> 
> 	/*
> 	 * Copy the supplied name and free the memory for mapped_name,
>@@ -313,12 +313,12 @@ static NTSTATUS catia_translate_name(struct vfs_handle_struct *handle,
> 		errno = ENOMEM;
> 		return NT_STATUS_NO_MEMORY;
> 	}
>-	ret = catia_string_replace_allocate(handle->conn, name,
>+	status = catia_string_replace_allocate(handle->conn, name,
> 			&mapped_name, direction);
> 
> 	TALLOC_FREE(name);
>-	if (!NT_STATUS_IS_OK(ret)) {
>-		return ret;
>+	if (!NT_STATUS_IS_OK(status)) {
>+		return status;
> 	}
> 
> 	ret = SMB_VFS_NEXT_TRANSLATE_NAME(handle, mapped_name, direction,
>@@ -326,6 +326,8 @@ static NTSTATUS catia_translate_name(struct vfs_handle_struct *handle,
> 
> 	if (NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED)) {
> 		*pmapped_name = talloc_move(mem_ctx, &mapped_name);
>+		/* we need to return the former translation result here */
>+		ret = status;
> 	} else {
> 		TALLOC_FREE(mapped_name);
> 	}
>-- 
>1.7.3.4
>

Actions: View

Attachments on bug 9701: 8612 | 8613 | 8614 | 8615 | 8616 | 8618 | 8619 | 8623