summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-10-07 15:14:50 -0700
committerJeremy Allison <jra@samba.org>2009-10-07 15:14:50 -0700
commit746fb5aa4fb562f7626cd39197f8ef087dbf20a7 (patch)
tree71cf75133acc3b5ac98be5c91356a2ebeddb4577
parent2f379d70ffa1dc8d2899489e35e715efe96a4b51 (diff)
downloadsamba-746fb5aa4fb562f7626cd39197f8ef087dbf20a7.tar.gz
samba-746fb5aa4fb562f7626cd39197f8ef087dbf20a7.tar.bz2
samba-746fb5aa4fb562f7626cd39197f8ef087dbf20a7.zip
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.
-rw-r--r--source3/smbd/files.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 146d809738..bf216050b8 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;
}