Changeset 751 for trunk/server/source3/smbd/file_access.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/smbd/file_access.c (modified) (4 diffs)

trunk/server/source3/smbd/file_access.c

@@ -42 +42 @@
         if (get_current_uid(conn) == (uid_t)0) {
                 /* 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;
         }
@@ -81 +88 @@
 
 bool can_delete_file_in_directory(connection_struct *conn,
-                                  struct smb_filename *smb_fname)
+                                  const struct smb_filename *smb_fname)
 {
         TALLOC_CTX *ctx = talloc_tos();
@@ -131 +138 @@
          * 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;
                 }
@@ -263 +262 @@
                                 SECINFO_DACL, &secdesc);
 
-        if (!NT_STATUS_IS_OK(status) || secdesc == NULL) {
+        if (!NT_STATUS_IS_OK(status) ||
+                        secdesc == NULL ||
+                        secdesc->dacl == NULL) {
+                TALLOC_FREE(secdesc);
                 return false;
         }