Changeset 989 for vendor/current/source3/smbd/close.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/close.c (modified) (7 diffs)

vendor/current/source3/smbd/close.c

@@ -169 +169 @@
         TALLOC_CTX *frame = talloc_stackframe();
         NTSTATUS status;
+        bool saved_posix_pathnames;
 
         status = vfs_streaminfo(conn, NULL, fname, talloc_tos(),
@@ -192 +193 @@
                 return NT_STATUS_OK;
         }
+
+        /*
+         * 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++) {
@@ -224 +232 @@
 
  fail:
+
+        (void)lp_set_posix_pathnames(saved_posix_pathnames);
         TALLOC_FREE(frame);
         return status;
@@ -247 +257 @@
         bool got_tokens = false;
         bool normal_close;
-        int ret_flock;
 
         /* Ensure any pending write time updates are done. */
@@ -268 +277 @@
                           "lock for file %s\n", fsp_str_dbg(fsp)));
                 return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        /* Remove the oplock before potentially deleting the file. */
+        if(fsp->oplock_type) {
+                remove_oplock_under_lock(fsp, lck);
         }
 
@@ -471 +485 @@
         }
 
-        /* remove filesystem sharemodes */
-        ret_flock = SMB_VFS_KERNEL_FLOCK(fsp, 0, 0);
-        if (ret_flock == -1) {
-                DEBUG(2, ("close_remove_share_mode: removing kernel flock for "
-                                        "%s failed: %s\n", fsp_str_dbg(fsp),
-                                        strerror(errno)));
+        if (fsp->kernel_share_modes_taken) {
+                int ret_flock;
+
+                /* remove filesystem sharemodes */
+                ret_flock = SMB_VFS_KERNEL_FLOCK(fsp, 0, 0);
+                if (ret_flock == -1) {
+                        DEBUG(2, ("close_remove_share_mode: removing kernel "
+                                  "flock for %s failed: %s\n",
+                                  fsp_str_dbg(fsp), strerror(errno)));
+                }
         }
 
@@ -732 +750 @@
                 file_free(req, fsp);
                 return NT_STATUS_OK;
-        }
-
-        /* Remove the oplock before potentially deleting the file. */
-        if(fsp->oplock_type) {
-                remove_oplock(fsp);
         }