Changeset 733 for branches/samba-3.5.x/source3/smbd/file_access.c

Timestamp:

Nov 12, 2012, 5:09:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.13

File:

• branches/samba-3.5.x/source3/smbd/file_access.c (modified) (2 diffs)

branches/samba-3.5.x/source3/smbd/file_access.c

@@ -38 +38 @@
         if (conn->server_info->utok.uid == 0 || conn->admin_user) {
                 /* I'm sorry sir, I didn't know you were root... */
+                return true;
+        }
+
+        if (access_mask == DELETE_ACCESS &&
+                        VALID_STAT(smb_fname->st) &&
+                        S_ISLNK(smb_fname->st.st_ex_mode)) {
+                /* We can always delete a symlink. */
                 return true;
         }
@@ -116 +123 @@
          * by owner of directory. */
         if (smb_fname_parent->st.st_ex_mode & S_ISVTX) {
-                if(SMB_VFS_STAT(conn, smb_fname) != 0) {
-                        if (errno == ENOENT) {
-                                /* If the file doesn't already exist then
-                                 * yes we'll be able to delete it. */
-                                ret = true;
-                                goto out;
-                        }
-                        DEBUG(10,("can_delete_file_in_directory: can't "
-                                  "stat file %s (%s)",
-                                  smb_fname_str_dbg(smb_fname),
-                                  strerror(errno) ));
-                        ret = false;
+                if (!VALID_STAT(smb_fname->st)) {
+                        /* If the file doesn't already exist then
+                         * yes we'll be able to delete it. */
+                        ret = true;
                         goto out;
                 }