[PATCH 3/6] server: Allow setting delete disposition on a read-only directory.

[Dmitry Timoshkov]

This makes next patch work for RemoveDirectory() call in
dlls/kernel32/tests/profile.c,test_profile_directory_readonly().

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 server/fd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/fd.c b/server/fd.c
index 7ee22999f0..0a76c622f2 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -2266,8 +2266,8 @@ static void set_fd_disposition( struct fd *fd, int unlink )
         return;
     }
 
-    /* can't unlink files we don't have permission to access */
-    if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)))
+    /* can't unlink files we don't have permission to write */
+    if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)) && !S_ISDIR(st.st_mode))
     {
         set_error( STATUS_CANNOT_DELETE );
         return;
-- 
2.17.1

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=42774

Your paranoid android.


=== debian9 (build log) ===

error: patch failed: dlls/ntdll/tests/file.c:3016
error: patch failed: dlls/ntdll/tests/file.c:3037
Task: Patch failed to apply