Changeset 599 for trunk/server/source3/smbd/open.c

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

File:

• trunk/server/source3/smbd/open.c (modified) (11 diffs)

trunk/server/source3/smbd/open.c

@@ -233 +233 @@
                          (unsigned int)smb_fname_parent->st.st_ex_uid,
                          strerror(errno) ));
-        }
-
-        DEBUG(10,("change_file_owner_to_parent: changed new file %s to "
+        } else {
+                DEBUG(10,("change_file_owner_to_parent: changed new file %s to "
                   "parent directory uid %u.\n", fsp_str_dbg(fsp),
                   (unsigned int)smb_fname_parent->st.st_ex_uid));
+
+                /* Ensure the uid entry is updated. */
+                fsp->fsp_name->st.st_ex_uid = smb_fname_parent->st.st_ex_uid;
+        }
 
         TALLOC_FREE(smb_fname_parent);
@@ -312 +315 @@
         /* Ensure we're pointing at the same place. */
         if (smb_fname_cwd->st.st_ex_dev != psbuf->st_ex_dev ||
-            smb_fname_cwd->st.st_ex_ino != psbuf->st_ex_ino ||
-            smb_fname_cwd->st.st_ex_mode != psbuf->st_ex_mode ) {
+            smb_fname_cwd->st.st_ex_ino != psbuf->st_ex_ino) {
                 DEBUG(0,("change_dir_owner_to_parent: "
-                         "device/inode/mode on directory %s changed. "
+                         "device/inode on directory %s changed. "
                          "Refusing to chown !\n", fname ));
                 status = NT_STATUS_ACCESS_DENIED;
@@ -338 +340 @@
                   "directory %s to parent directory uid %u.\n",
                   fname, (unsigned int)smb_fname_parent->st.st_ex_uid ));
+
+        /* Ensure the uid entry is updated. */
+        psbuf->st_ex_uid = smb_fname_parent->st.st_ex_uid;
 
  chdir:
@@ -365 +370 @@
         int local_flags = flags;
         bool file_existed = VALID_STAT(fsp->fsp_name->st);
+        bool file_created = false;
 
         fsp->fh->fd = -1;
@@ -464 +470 @@
 
                 if ((local_flags & O_CREAT) && !file_existed) {
-
-                        /* Inherit the ACL if required */
-                        if (lp_inherit_perms(SNUM(conn))) {
-                                inherit_access_posix_acl(conn, parent_dir,
-                                                         smb_fname->base_name,
-                                                         unx_mode);
-                        }
-
-                        /* Change the owner if required. */
-                        if (lp_inherit_owner(SNUM(conn))) {
-                                change_file_owner_to_parent(conn, parent_dir,
-                                                            fsp);
-                        }
-
-                        notify_fname(conn, NOTIFY_ACTION_ADDED,
-                                     FILE_NOTIFY_CHANGE_FILE_NAME,
-                                     smb_fname->base_name);
+                        file_created = true;
                 }
 
@@ -589 +579 @@
                         fd_close(fsp);
                         return status;
+                }
+
+                if (file_created) {
+                        /* Do all inheritance work after we've
+                           done a successful stat call and filled
+                           in the stat struct in fsp->fsp_name. */
+
+                        /* Inherit the ACL if required */
+                        if (lp_inherit_perms(SNUM(conn))) {
+                                inherit_access_posix_acl(conn, parent_dir,
+                                                         smb_fname->base_name,
+                                                         unx_mode);
+                        }
+
+                        /* Change the owner if required. */
+                        if (lp_inherit_owner(SNUM(conn))) {
+                                change_file_owner_to_parent(conn, parent_dir,
+                                                            fsp);
+                        }
+
+                        notify_fname(conn, NOTIFY_ACTION_ADDED,
+                                     FILE_NOTIFY_CHANGE_FILE_NAME,
+                                     smb_fname->base_name);
                 }
         }
@@ -2307 +2320 @@
         NTSTATUS status;
         bool posix_open = false;
+        bool need_re_stat = false;
 
         if(!CAN_WRITE(conn)) {
@@ -2361 +2375 @@
                 inherit_access_posix_acl(conn, parent_dir,
                                          smb_dname->base_name, mode);
+                need_re_stat = true;
         }
 
@@ -2375 +2390 @@
                                       (smb_dname->st.st_ex_mode |
                                           (mode & ~smb_dname->st.st_ex_mode)));
+                        need_re_stat = true;
                 }
         }
@@ -2383 +2399 @@
                                            smb_dname->base_name,
                                            &smb_dname->st);
+                need_re_stat = true;
+        }
+
+        if (need_re_stat) {
+                if (SMB_VFS_LSTAT(conn, smb_dname) == -1) {
+                        DEBUG(2, ("Could not stat directory '%s' just created: %s\n",
+                          smb_fname_str_dbg(smb_dname), strerror(errno)));
+                        return map_nt_error_from_unix(errno);
+                }
         }
 
@@ -2945 +2970 @@
         if (lp_acl_check_permissions(SNUM(conn))
             && (create_disposition != FILE_CREATE)
-            && (share_access & FILE_SHARE_DELETE)
             && (access_mask & DELETE_ACCESS)
             && (!(can_delete_file_in_directory(conn, smb_fname) ||