From 7b9381fb4f0db661a32ab884fb621cb6806ecd32 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 28 Feb 2009 13:14:23 -0800
Subject: Fix bug #6082 - smbd_gpfs_getacl failed: Windows client can´t rename
 or delete file (directory fix). Jeremy.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source3/smbd/open.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'source3')

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a42705adb6..569c260319 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2457,6 +2457,25 @@ static NTSTATUS open_directory(connection_struct *conn,
 					fname,
 					access_mask,
 					&access_granted);
+
+		/* Were we trying to do a directory open
+		 * for delete and didn't get DELETE
+		 * access (only) ? Check if the
+		 * directory allows DELETE_CHILD.
+		 * See here:
+		 * http://blogs.msdn.com/oldnewthing/archive/2004/06/04/148426.aspx
+		 * for details. */
+
+		if ((NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) &&
+				(access_mask & DELETE_ACCESS) &&
+				(access_granted == DELETE_ACCESS) &&
+				can_delete_file_in_directory(conn, fname))) {
+			DEBUG(10,("open_directory: overrode ACCESS_DENIED "
+				"on directory %s\n",
+				fname ));
+			status = NT_STATUS_OK;
+		}
+
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(10, ("open_directory: check_open_rights on "
 				"file %s failed with %s\n",
-- 
cgit