[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-85-g7b9381f

Jeremy Allison jra at samba.org
Sat Feb 28 21:14:36 GMT 2009


The branch, master has been updated
       via  7b9381fb4f0db661a32ab884fb621cb6806ecd32 (commit)
      from  5686a6d91a2e1669dd9d00ba1faf493b0bb5ee90 (commit)

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


- Log -----------------------------------------------------------------
commit 7b9381fb4f0db661a32ab884fb621cb6806ecd32
Author: Jeremy Allison <jra at samba.org>
Date:   Sat Feb 28 13:14:23 2009 -0800

    Fix bug #6082 - smbd_gpfs_getacl failed: Windows client can´t rename or
    delete file (directory fix).
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/open.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a42705a..569c260 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",


-- 
Samba Shared Repository


More information about the samba-cvs mailing list