The branch, v3-3-test has been updated
       via  fc5765f843fbbe0a8c9ae6be6dc7658033d539d3 (commit)
      from  13a13122f40221edd76aeaaff47c8964a692301a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit fc5765f843fbbe0a8c9ae6be6dc7658033d539d3
Author: Jeremy Allison <[email protected]>
Date:   Sat Feb 28 13:14:54 2009 -0800

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

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

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


Changeset truncated at 500 lines:

diff --git a/source/smbd/open.c b/source/smbd/open.c
index 31679b5..9b51ff0 100644
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -2462,6 +2462,25 @@ 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

Reply via email to