commit 8b0feb253bc569a39e724a8da006735166fc1b32
author Alexandre Julliard <julliard@winehq.org> Fri Jan 27 15:50:38 2006 +0100
committer Alexandre Julliard <julliard@winehq.org> Fri Jan 27 15:50:38 2006 +0100
tree 8d5ef9726fde9c3513ac359dbeec666668e5779f
parent d37a119ee66ad43099791605a748013ec69c7e2f

server: Make the FILE_SHARE_DELETE sharing checks depend on DELETE
access instead of on the FILE_DELETE_ON_CLOSE flag (based on a patch
by Mike McCormack).

server/fd.c

diff --git a/server/fd.c b/server/fd.c
index a142acd..ed98821 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -1283,7 +1283,6 @@
 {
     unsigned int existing_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
     unsigned int existing_access = 0;
-    int unlink = 0;
     struct list *ptr;
 
     /* if access mode is 0, sharing mode is ignored */
@@ -1298,16 +1297,15 @@
         {
             existing_sharing &= fd_ptr->sharing;
             existing_access  |= fd_ptr->access;
-            if (fd_ptr->closed->unlink[0]) unlink = 1;
         }
     }
 
     if ((access & FILE_UNIX_READ_ACCESS) && !(existing_sharing & FILE_SHARE_READ)) return 0;
     if ((access & FILE_UNIX_WRITE_ACCESS) && !(existing_sharing & FILE_SHARE_WRITE)) return 0;
+    if ((access & DELETE) && !(existing_sharing & FILE_SHARE_DELETE)) return 0;
     if ((existing_access & FILE_UNIX_READ_ACCESS) && !(sharing & FILE_SHARE_READ)) return 0;
     if ((existing_access & FILE_UNIX_WRITE_ACCESS) && !(sharing & FILE_SHARE_WRITE)) return 0;
-    if (fd->closed->unlink[0] && !(existing_sharing & FILE_SHARE_DELETE)) return 0;
-    if (unlink && !(sharing & FILE_SHARE_DELETE)) return 0;
+    if ((existing_access & DELETE) && !(sharing & FILE_SHARE_DELETE)) return 0;
     return 1;
 }
 
@@ -1329,6 +1327,12 @@
     const char *unlink_name = "";
     int rw_mode;
 
+    if ((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE))
+    {
+        set_error( STATUS_INVALID_PARAMETER );
+        return NULL;
+    }
+
     if (!(fd = alloc_fd_object())) return NULL;
 
     if (options & FILE_DELETE_ON_CLOSE) unlink_name = name;