Changeset 751 for trunk/server/source3/smbd/reply.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/reply.c (modified) (11 diffs)

trunk/server/source3/smbd/reply.c

@@ -1767 +1767 @@
         }
 
-        if (!map_open_params_to_ntcreate(smb_fname, deny_mode,
+        if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
                                          OPENX_FILE_EXISTS_OPEN, &access_mask,
                                          &share_mode, &create_disposition,
@@ -1942 +1942 @@
         }
 
-        if (!map_open_params_to_ntcreate(smb_fname, deny_mode, smb_ofun,
+        if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
+                                         smb_ofun,
                                          &access_mask, &share_mode,
                                          &create_disposition,
@@ -2541 +2542 @@
 
         /* The set is across all open files on this dev/inode pair. */
-        if (!set_delete_on_close(fsp, True, &conn->session_info->utok)) {
+        if (!set_delete_on_close(fsp, true,
+                                conn->session_info->security_token,
+                                &conn->session_info->utok)) {
                 close_file(req, fsp, NORMAL_CLOSE);
                 return NT_STATUS_ACCESS_DENIED;
@@ -4630 +4633 @@
         SSVAL(req->outbuf,smb_vwv4,nwritten>>16);
 
-        if (nwritten < (ssize_t)numtowrite) {
-                SCVAL(req->outbuf,smb_rcls,ERRHRD);
-                SSVAL(req->outbuf,smb_err,ERRdiskfull);
-        }
-
         DEBUG(3,("writeX fnum=%d num=%d wrote=%d\n",
                 fsp->fnum, (int)numtowrite, (int)nwritten));
@@ -5655 +5653 @@
         }
 
-        if (!set_delete_on_close(fsp, true, &conn->session_info->utok)) {
+        if (!set_delete_on_close(fsp, true,
+                        conn->session_info->security_token,
+                        &conn->session_info->utok)) {
                 close_file(req, fsp, ERROR_CLOSE);
                 reply_nterror(req, NT_STATUS_ACCESS_DENIED);
@@ -5936 +5936 @@
 
 /****************************************************************************
+ Returns an error if the parent directory for a filename is open in an
+ incompatible way.
+****************************************************************************/
+
+static NTSTATUS parent_dirname_compatible_open(connection_struct *conn,
+                                        const struct smb_filename *smb_fname_dst_in)
+{
+        char *parent_dir = NULL;
+        struct smb_filename smb_fname_parent;
+        struct file_id id;
+        files_struct *fsp = NULL;
+        int ret;
+
+        if (!parent_dirname(talloc_tos(), smb_fname_dst_in->base_name,
+                        &parent_dir, NULL)) {
+                return NT_STATUS_NO_MEMORY;
+        }
+        ZERO_STRUCT(smb_fname_parent);
+        smb_fname_parent.base_name = parent_dir;
+
+        ret = SMB_VFS_LSTAT(conn, &smb_fname_parent);
+        if (ret == -1) {
+                return map_nt_error_from_unix(errno);
+        }
+
+        /*
+         * We're only checking on this smbd here, mostly good
+         * enough.. and will pass tests.
+         */
+
+        id = vfs_file_id_from_sbuf(conn, &smb_fname_parent.st);
+        for (fsp = file_find_di_first(conn->sconn, id); fsp;
+                        fsp = file_find_di_next(fsp)) {
+                if (fsp->access_mask & DELETE_ACCESS) {
+                        return NT_STATUS_SHARING_VIOLATION;
+                }
+        }
+        return NT_STATUS_OK;
+}
+
+/****************************************************************************
  Rename an open file - given an fsp.
 ****************************************************************************/
@@ -5959 +6000 @@
 
         status = check_name(conn, smb_fname_dst_in->base_name);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        status = parent_dirname_compatible_open(conn, smb_fname_dst_in);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -6569 +6615 @@
         struct smb_filename *smb_fname_src = NULL;
         struct smb_filename *smb_fname_dst = NULL;
+        uint32_t src_ucf_flags = lp_posix_pathnames() ? UCF_UNIX_NAME_LOOKUP : UCF_COND_ALLOW_WCARD_LCOMP;
+        uint32_t dst_ucf_flags = UCF_SAVE_LCOMP | (lp_posix_pathnames() ? 0 : UCF_COND_ALLOW_WCARD_LCOMP);
         bool stream_rename = false;
 
@@ -6611 +6659 @@
                                   req->flags2 & FLAGS2_DFS_PATHNAMES,
                                   name,
-                                  UCF_COND_ALLOW_WCARD_LCOMP,
+                                  src_ucf_flags,
                                   &src_has_wcard,
                                   &smb_fname_src);
@@ -6629 +6677 @@
                                   req->flags2 & FLAGS2_DFS_PATHNAMES,
                                   newname,
-                                  UCF_COND_ALLOW_WCARD_LCOMP | UCF_SAVE_LCOMP,
+                                  dst_ucf_flags,
                                   &dest_has_wcard,
                                   &smb_fname_dst);
@@ -6740 +6788 @@
                 new_create_disposition = FILE_OPEN;
         } else {
-                if (!map_open_params_to_ntcreate(smb_fname_dst_tmp, 0, ofun,
+                if (!map_open_params_to_ntcreate(smb_fname_dst_tmp->base_name,
+                                                 0, ofun,
                                                  NULL, NULL,
                                                  &new_create_disposition,