[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-5027-geb02b1e
Jeremy Allison
jra at samba.org
Thu Feb 26 19:43:40 GMT 2009
The branch, v3-3-test has been updated
via eb02b1e7fe98f826606d0129b1ba172b8645207a (commit)
from 032f052c9ccfb32f822352155e5f3c17a34f896a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit eb02b1e7fe98f826606d0129b1ba172b8645207a
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 26 11:43:07 2009 -0800
Make us pass the RAW-RENAME torture test I just added.
Inside a directory, keep a file open and then renaming
the directory should fail with ACCESS_DENIED.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/include/proto.h | 1 +
source/smbd/files.c | 43 +++++++++++++++++++++++++++++++++++++++++++
source/smbd/reply.c | 10 ++++++++++
3 files changed, 54 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/proto.h b/source/include/proto.h
index 72d3ffe..c008843 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -8906,6 +8906,7 @@ files_struct *file_find_fsp(files_struct *orig_fsp);
files_struct *file_find_di_first(struct file_id id);
files_struct *file_find_di_next(files_struct *start_fsp);
files_struct *file_find_print(void);
+bool file_find_subpath(files_struct *dir_fsp);
void file_sync_all(connection_struct *conn);
void file_free(files_struct *fsp);
files_struct *file_fnum(uint16 fnum);
diff --git a/source/smbd/files.c b/source/smbd/files.c
index 4e4004c..cdaa5f1 100644
--- a/source/smbd/files.c
+++ b/source/smbd/files.c
@@ -377,6 +377,49 @@ files_struct *file_find_print(void)
}
/****************************************************************************
+ Find any fsp open with a pathname below that of an already open path.
+****************************************************************************/
+
+bool file_find_subpath(files_struct *dir_fsp)
+{
+ files_struct *fsp;
+ size_t dlen;
+ char *d_fullname = talloc_asprintf(talloc_tos(),
+ "%s/%s",
+ dir_fsp->conn->connectpath,
+ dir_fsp->fsp_name);
+
+ if (!d_fullname) {
+ return false;
+ }
+
+ dlen = strlen(d_fullname);
+
+ for (fsp=Files;fsp;fsp=fsp->next) {
+ char *d1_fullname;
+
+ if (fsp == dir_fsp) {
+ continue;
+ }
+
+ d1_fullname = talloc_asprintf(talloc_tos(),
+ "%s/%s",
+ fsp->conn->connectpath,
+ fsp->fsp_name);
+
+ if (strnequal(d_fullname, d1_fullname, dlen)) {
+ TALLOC_FREE(d_fullname);
+ TALLOC_FREE(d1_fullname);
+ return true;
+ }
+ TALLOC_FREE(d1_fullname);
+ }
+
+ TALLOC_FREE(d_fullname);
+ return false;
+}
+
+/****************************************************************************
Sync open files on a connection.
****************************************************************************/
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 3eec795..499b67f 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -2263,6 +2263,16 @@ static NTSTATUS can_rename(connection_struct *conn, files_struct *fsp,
}
if (S_ISDIR(pst->st_mode)) {
+ if (fsp->posix_open) {
+ return NT_STATUS_OK;
+ }
+
+ /* If no pathnames are open below this
+ directory, allow the rename. */
+
+ if (file_find_subpath(fsp)) {
+ return NT_STATUS_ACCESS_DENIED;
+ }
return NT_STATUS_OK;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list