The branch, v3-2-test has been updated
via dd43302066b2d3f5270d3ee25a1e2c85d8ce2b85 (commit)
from 6debf35c1575a25f98f927726742a7f34b3a55a9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit dd43302066b2d3f5270d3ee25a1e2c85d8ce2b85
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Fri Sep 26 15:18:18 2008 -0700
Fix bug #5797 - Moving readonly files fails. Reported by [EMAIL PROTECTED]
We don't need to deny a DELETE open on a readonly file (I'm also adding a s4
torture test for this), the set_file_disposition call will return
NT_STATUS_CANNOT_DELETE if the delete-on-close bit is set
on a readonly file (and we already do this).
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/smbd/open.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/open.c b/source/smbd/open.c
index afe8d5e..c21ad20 100644
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -2662,9 +2662,7 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
&& (create_disposition != FILE_CREATE)
&& (share_access & FILE_SHARE_DELETE)
&& (access_mask & DELETE_ACCESS)
- && (((dos_mode(conn, fname, &sbuf) & FILE_ATTRIBUTE_READONLY)
- && !lp_delete_readonly(SNUM(conn)))
- || !can_delete_file_in_directory(conn, fname))) {
+ && (!can_delete_file_in_directory(conn, fname))) {
status = NT_STATUS_ACCESS_DENIED;
goto fail;
}
--
Samba Shared Repository
