[SCM] Samba Shared Repository - branch master updated - da8bebaa646db4c298038ba0013b47e88840977e

[Jeremy Allison]

The branch, master has been updated
       via  da8bebaa646db4c298038ba0013b47e88840977e (commit)
      from  cd49586b29d754e497d10ed18be5d9b27e8c4a3d (commit)

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


- Log -----------------------------------------------------------------
commit da8bebaa646db4c298038ba0013b47e88840977e
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Sep 26 15:17:14 2008 -0700

    Fix bug #5797 - Moving readonly files fails. Reported by infomail at lordb.de.
    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:
 source3/smbd/open.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 7119147..ad024a5 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2608,9 +2608,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