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

trunk/server/source3/smbd/trans2.c

@@ -876 +876 @@
                 reply_outbuf(req, 10, total_sent_thistime + alignment_offset
                              + data_alignment_offset);
-
-                /*
-                 * We might have SMBtrans2s in req which was transferred to
-                 * the outbuf, fix that.
-                 */
-                SCVAL(req->outbuf, smb_com, SMBtrans2);
 
                 /* Set total params and data to be sent */
@@ -1097 +1091 @@
         }
 
-        if (!map_open_params_to_ntcreate(smb_fname, deny_mode, open_ofun,
+        if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
+                                         open_ofun,
                                          &access_mask, &share_mode,
                                          &create_disposition,
@@ -2284 +2279 @@
         struct dptr_struct *dirptr = NULL;
         struct smbd_server_connection *sconn = req->sconn;
+        uint32_t ucf_flags = (UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP);
 
         if (total_params < 13) {
@@ -2327 +2323 @@
                                 goto out;
                         }
+                        ucf_flags |= UCF_UNIX_NAME_LOOKUP;
                         break;
                 default:
@@ -2344 +2341 @@
                                     req->flags2 & FLAGS2_DFS_PATHNAMES,
                                     directory,
-                                    (UCF_SAVE_LCOMP |
-                                        UCF_ALWAYS_ALLOW_WCARD_LCOMP),
+                                    ucf_flags,
                                     &mask_contains_wcard,
                                     &smb_dname);
@@ -4686 +4682 @@
                 case SMB_QUERY_FILE_STREAM_INFO:
                 case SMB_FILE_STREAM_INFORMATION: {
-                        unsigned int num_streams;
-                        struct stream_struct *streams;
+                        unsigned int num_streams = 0;
+                        struct stream_struct *streams = NULL;
 
                         DEBUG(10,("smbd_do_qfilepathinfo: "
@@ -4696 +4692 @@
                         }
 
-                        status = SMB_VFS_STREAMINFO(
-                                conn, fsp, smb_fname->base_name, talloc_tos(),
-                                &num_streams, &streams);
+                        status = vfs_streaminfo(conn, fsp, smb_fname->base_name,
+                                                talloc_tos(), &num_streams, &streams);
 
                         if (!NT_STATUS_IS_OK(status)) {
@@ -5117 +5112 @@
                 uint32_t name_hash;
                 char *fname = NULL;
+                uint32_t ucf_flags = 0;
 
                 /* qpathinfo */
@@ -5128 +5124 @@
                 DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
 
-                if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-                        reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                        return;
+                if (INFO_LEVEL_IS_UNIX(info_level)) {
+                        if (!lp_unix_extensions()) {
+                                reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+                                return;
+                        }
+                        if (info_level == SMB_QUERY_FILE_UNIX_BASIC ||
+                                        info_level == SMB_QUERY_FILE_UNIX_INFO2 ||
+                                        info_level == SMB_QUERY_FILE_UNIX_LINK) {
+                                ucf_flags |= UCF_UNIX_NAME_LOOKUP;
+                        }
                 }
 
@@ -5145 +5148 @@
                                         req->flags2 & FLAGS2_DFS_PATHNAMES,
                                         fname,
-                                        0,
+                                        ucf_flags,
                                         NULL,
                                         &smb_fname);
@@ -5841 +5844 @@
         /* The set is across all open files on this dev/inode pair. */
         if (!set_delete_on_close(fsp, delete_on_close,
+                                 conn->session_info->security_token,
                                  &conn->session_info->utok)) {
                 return NT_STATUS_ACCESS_DENIED;
@@ -7998 +8002 @@
         } else {
                 char *fname = NULL;
+                uint32_t ucf_flags = 0;
 
                 /* set path info */
@@ -8014 +8019 @@
                 }
 
+                if (info_level == SMB_SET_FILE_UNIX_BASIC ||
+                                info_level == SMB_SET_FILE_UNIX_INFO2 ||
+                                info_level == SMB_FILE_RENAME_INFORMATION ||
+                                info_level == SMB_POSIX_PATH_UNLINK) {
+                        ucf_flags |= UCF_UNIX_NAME_LOOKUP;
+                }
+
                 status = filename_convert(req, conn,
                                          req->flags2 & FLAGS2_DFS_PATHNAMES,
                                          fname,
-                                         0,
+                                         ucf_flags,
                                          NULL,
                                          &smb_fname);
@@ -8844 +8856 @@
         show_msg((char *)req->inbuf);
 
+        /* Windows clients expect all replies to
+           a transact secondary (SMBtranss2 0x33)
+           to have a command code of transact
+           (SMBtrans2 0x32). See bug #8989
+           and also [MS-CIFS] section 2.2.4.47.2
+           for details.
+        */
+        req->cmd = SMBtrans2;
+
         if (req->wct < 8) {
                 reply_nterror(req, NT_STATUS_INVALID_PARAMETER);