Changeset 732 for branches/samba-3.5.x/source3/smbd/trans2.c

Timestamp:

Nov 12, 2012, 4:35:55 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.12

File:

• branches/samba-3.5.x/source3/smbd/trans2.c (modified) (7 diffs)

branches/samba-3.5.x/source3/smbd/trans2.c

@@ -1082 +1082 @@
         }
 
-        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,
@@ -2246 +2247 @@
         struct dptr_struct *dirptr = NULL;
         struct smbd_server_connection *sconn = smbd_server_conn;
+        uint32_t ucf_flags = (UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP);
 
         if (total_params < 13) {
@@ -2289 +2291 @@
                                 goto out;
                         }
+                        ucf_flags |= UCF_UNIX_NAME_LOOKUP;
                         break;
                 default:
@@ -2306 +2309 @@
                                     req->flags2 & FLAGS2_DFS_PATHNAMES,
                                     directory,
-                                    (UCF_SAVE_LCOMP |
-                                        UCF_ALWAYS_ALLOW_WCARD_LCOMP),
+                                    ucf_flags,
                                     &mask_contains_wcard,
                                     &smb_dname);
@@ -5102 +5104 @@
         } else {
                 char *fname = NULL;
+                uint32_t ucf_flags = 0;
 
                 /* qpathinfo */
@@ -5113 +5116 @@
                 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;
+                        }
                 }
 
@@ -5130 +5140 @@
                                         req->flags2 & FLAGS2_DFS_PATHNAMES,
                                         fname,
-                                        0,
+                                        ucf_flags,
                                         NULL,
                                         &smb_fname);