Attachment 4809 Details for Bug 6781 – git-am patch for 3.3.9

[patch] git-am patch for 3.3.9

0001-Correct-fix-for-bug-6781-Cannot-rename-subfolders.patch (text/plain), 1.12 KB, created by Jeremy Allison on 2009-10-07 17:52:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2009-10-07 17:52:40 UTC

Size: 1.12 KB

patch

obsolete

>From c79db5f7c634c719915dab94b84c5bc5d73bfdc6 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 7 Oct 2009 15:49:56 -0700
>Subject: [PATCH] Correct fix for bug 6781 - Cannot rename subfolders in Explorer view with recent versions of Samba.
> Without this fix, renaming a directory ./a to ./b, whilst a directory ./aa was already open
> would fail.
> Jeremy.
>
>---
> source/smbd/files.c |    9 +++++++--
> 1 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/source/smbd/files.c b/source/smbd/files.c
>index cdaa5f1..e74ad7a 100644
>--- a/source/smbd/files.c
>+++ b/source/smbd/files.c
>@@ -407,13 +407,18 @@ bool file_find_subpath(files_struct *dir_fsp)
> 					fsp->conn->connectpath,
> 					fsp->fsp_name);
> 
>-		if (strnequal(d_fullname, d1_fullname, dlen)) {
>+		/*
>+		 * If the open file has a path that is a longer
>+		 * component, then it's a subpath.
>+		 */
>+		if (strnequal(d_fullname, d1_fullname, dlen) &&
>+				(d1_fullname[dlen] == '/')) {
> 			TALLOC_FREE(d_fullname);
> 			TALLOC_FREE(d1_fullname);
> 			return true;
> 		}
> 		TALLOC_FREE(d1_fullname);
>-	} 
>+	}
> 
> 	TALLOC_FREE(d_fullname);
> 	return false;
>-- 
>1.5.4.3
>

Flags:

vl: review+

Actions: View

Attachments on bug 6781: 4791 | 4803 | 4804 | 4805 | 4806 | 4807 | 4808 | 4809