[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  746fb5a... 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.
      from  2f379d7... s4/torture: Ported SMBv1 RAW-OPEN tests to SMB2-CREATE

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 746fb5aa4fb562f7626cd39197f8ef087dbf20a7
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 7 15:14:50 2009 -0700

    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.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/files.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 146d809..bf21605 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -430,14 +430,12 @@ bool file_find_subpath(files_struct *dir_fsp)
 					fsp->fsp_name->base_name);
 
 		if (strnequal(d_fullname, d1_fullname, dlen)) {
-			int d1_len = strlen(d1_fullname);
-
 			/*
 			 * If the open file is a second file handle to the
 			 * same name or is a stream on the original file, then
 			 * don't return true.
 			 */
-			if (d1_len == dlen) {
+			if (d1_fullname[dlen] != '/') {
 				TALLOC_FREE(d1_fullname);
 				continue;
 			}


-- 
Samba Shared Repository