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

Timestamp:

Jun 17, 2009, 2:19:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

File:

• branches/samba-3.3.x/source/smbd/file_access.c (modified) (3 diffs)

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

@@ -93 +93 @@
 
 #ifdef S_ISVTX
-        /* sticky bit means delete only by owner or root. */
+        /* sticky bit means delete only by owner of file or by root or
+         * by owner of directory. */
         if (sbuf.st_mode & S_ISVTX) {
                 SMB_STRUCT_STAT sbuf_file;
@@ -102 +103 @@
                                 return True;
                         }
+                        DEBUG(10,("can_delete_file_in_directory: can't "
+                                "stat file %s (%s)",
+                                fname, strerror(errno) ));
                         return False;
                 }
@@ -108 +112 @@
                  * for bug #3348. Don't assume owning sticky bit
                  * directory means write access allowed.
+                 * Fail to delete if we're not the owner of the file,
+                 * or the owner of the directory as we have no possible
+                 * chance of deleting. Otherwise, go on and check the ACL.
                  */
-                if (conn->server_info->utok.uid != sbuf_file.st_uid) {
+                if ((conn->server_info->utok.uid != sbuf.st_uid) &&
+                                (conn->server_info->utok.uid != sbuf_file.st_uid)) {
+                        DEBUG(10,("can_delete_file_in_directory: not "
+                                "owner of file %s or directory %s",
+                                fname, dname));
                         return False;
                 }