Changeset 221 for branches/samba-3.3.x/source/smbd/file_access.c

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/smbd/file_access.c (modified) (1 diff)

branches/samba-3.3.x/source/smbd/file_access.c

@@ -117 +117 @@
          * not help, by the DELETE_CHILD bit on the containing directory.
          *
-         * Here we check the other way round because with just posix
-         * permissions looking at the file itself will never grant DELETE, so
-         * by looking at the directory first we save one get_acl call.
+         * Here we only check the directory permissions, we will
+         * check the file DELETE permission separately.
          */
 
-        if (can_access_file_acl(conn, dname, FILE_DELETE_CHILD)) {
-                return true;
-        }
-
-        return can_access_file_acl(conn, fname, DELETE_ACCESS);
+        return can_access_file_acl(conn, dname, FILE_DELETE_CHILD);
 }