Changeset 989 for vendor/current/source3/smbd/open.c

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/smbd/open.c (modified) (6 diffs)

vendor/current/source3/smbd/open.c

@@ -884 +884 @@
                 }
 
+                if (local_flags & O_NONBLOCK) {
+                        /*
+                         * GPFS can return ETIMEDOUT for pread on
+                         * nonblocking file descriptors when files
+                         * migrated to tape need to be recalled. I
+                         * could imagine this happens elsehwere
+                         * too. With blocking file descriptors this
+                         * does not happen.
+                         */
+                        ret = set_blocking(fsp->fh->fd, true);
+                        if (ret == -1) {
+                                status = map_nt_error_from_unix(errno);
+                                DBG_WARNING("Could not set fd to blocking: "
+                                            "%s\n", strerror(errno));
+                                fd_close(fsp);
+                                return status;
+                        }
+                }
+
                 ret = SMB_VFS_FSTAT(fsp, &smb_fname->st);
                 if (ret == -1) {
@@ -2518 +2537 @@
                 new_dos_attributes &= SAMBA_ATTRIBUTES_MASK;
                 if (file_existed) {
-                        existing_dos_attributes = dos_mode(conn, smb_fname);
+                        /*
+                         * Only use strored DOS attributes for checks
+                         * against requested attributes (below via
+                         * open_match_attributes()), cf bug #11992
+                         * for details. -slow
+                         */
+                        bool ok;
+                        uint32_t attr = 0;
+
+                        ok = get_ea_dos_attribute(conn, smb_fname, &attr);
+                        if (ok) {
+                                existing_dos_attributes = attr;
+                        }
                 }
         }
@@ -3085 +3116 @@
                         return NT_STATUS_SHARING_VIOLATION;
                 }
+
+                fsp->kernel_share_modes_taken = true;
         }
 
@@ -3858 +3891 @@
         TALLOC_CTX *frame = talloc_stackframe();
         NTSTATUS status;
+        bool saved_posix_pathnames;
 
         status = vfs_streaminfo(conn, NULL, fname, talloc_tos(),
@@ -3889 +3923 @@
                 goto fail;
         }
+
+        /*
+         * Any stream names *must* be treated as Windows
+         * pathnames, even if we're using UNIX extensions.
+         */
+
+        saved_posix_pathnames = lp_set_posix_pathnames(false);
 
         for (i=0; i<num_streams; i++) {
@@ -3957 +3998 @@
 
  fail:
+
+        (void)lp_set_posix_pathnames(saved_posix_pathnames);
         TALLOC_FREE(frame);
         return status;