Changeset 223 for branches/samba-3.3.x/source/smbd/open.c

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/smbd/open.c (modified) (2 diffs)

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

@@ -426 +426 @@
                         if (!NT_STATUS_IS_OK(status)) {
                                 if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+                                        /*
+                                         * On NT_STATUS_ACCESS_DENIED, access_granted
+                                         * contains the denied bits.
+                                         */
+
+                                        if ((access_mask & FILE_WRITE_ATTRIBUTES) &&
+                                                        (access_granted & FILE_WRITE_ATTRIBUTES) &&
+                                                        (lp_map_readonly(SNUM(conn)) ||
+                                                         lp_map_archive(SNUM(conn)) ||
+                                                         lp_map_hidden(SNUM(conn)) ||
+                                                         lp_map_system(SNUM(conn)))) {
+                                                access_granted &= ~FILE_WRITE_ATTRIBUTES;
+
+                                                DEBUG(10,("open_file: overrode FILE_WRITE_ATTRIBUTES "
+                                                        "on file %s\n",
+                                                        path ));
+                                        }
+
                                         if ((access_mask & DELETE_ACCESS) &&
-                                                        (access_granted == DELETE_ACCESS) &&
+                                                        (access_granted & DELETE_ACCESS) &&
                                                         can_delete_file_in_directory(conn, path)) {
                                                 /* Were we trying to do a stat open
@@ -437 +455 @@
                                                  * for details. */
 
-                                                DEBUG(10,("open_file: overrode ACCESS_DENIED "
+                                                access_granted &= ~DELETE_ACCESS;
+
+                                                DEBUG(10,("open_file: overrode DELETE_ACCESS "
                                                         "on file %s\n",
                                                         path ));
-                                        } else {
+                                        }
+
+                                        if (access_granted != 0) {
                                                 DEBUG(10, ("open_file: Access denied on "
                                                         "file %s\n",