Changeset 136 for trunk/samba/source/smbd/trans2.c

Timestamp:

May 29, 2008, 12:22:03 PM (17 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0rc1

File:

• trunk/samba/source/smbd/trans2.c (modified) (5 diffs)

trunk/samba/source/smbd/trans2.c

@@ -1206 +1206 @@
         return NT_STATUS_OK;
 }
+
+/****************************************************************************
+ Needed to show the msdfs symlinks as directories. Modifies psbuf
+ to be a directory if it's a msdfs link.
+****************************************************************************/
+
+static bool check_msdfs_link(connection_struct *conn,
+                                const char *pathname,
+                                SMB_STRUCT_STAT *psbuf)
+{
+        int saved_errno = errno;
+        if(lp_host_msdfs() &&
+                lp_msdfs_root(SNUM(conn)) &&
+                is_msdfs_link(conn, pathname, psbuf)) {
+
+                DEBUG(5,("check_msdfs_link: Masquerading msdfs link %s "
+                        "as a directory\n",
+                        pathname));
+                psbuf->st_mode = (psbuf->st_mode & 0xFFF) | S_IFDIR;
+                errno = saved_errno;
+                return true;
+        }
+        errno = saved_errno;
+        return false;
+}
+
 
 /****************************************************************************
@@ -1372 +1398 @@
                                  * directories */
 
-                                if(lp_host_msdfs() &&
-                                   lp_msdfs_root(SNUM(conn)) &&
-                                   ((ms_dfs_link = is_msdfs_link(conn, pathreal, &sbuf)) == True)) {
-                                        DEBUG(5,("get_lanman2_dir_entry: Masquerading msdfs link %s "
-                                                "as a directory\n",
-                                                pathreal));
-                                        sbuf.st_mode = (sbuf.st_mode & 0xFFF) | S_IFDIR;
-
-                                } else {
-
+                                ms_dfs_link = check_msdfs_link(conn, pathreal, &sbuf);
+                                if (!ms_dfs_link) {
                                         DEBUG(5,("get_lanman2_dir_entry:Couldn't stat [%s] (%s)\n",
                                                 pathreal,strerror(errno)));
@@ -3818 +3836 @@
         uint32 access_mask = 0x12019F; /* Default - GENERIC_EXECUTE mapping from Windows */
         char *lock_data = NULL;
+        bool ms_dfs_link = false;
         TALLOC_CTX *ctx = talloc_tos();
 
@@ -3971 +3990 @@
                                 return;
                         }
+
                 } else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,fname,&sbuf) && (info_level != SMB_INFO_IS_NAME_VALID)) {
-                        DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
-                        reply_unixerror(req, ERRDOS, ERRbadpath);
-                        return;
+                        ms_dfs_link = check_msdfs_link(conn,fname,&sbuf);
+
+                        if (!ms_dfs_link) {
+                                DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
+                                reply_unixerror(req, ERRDOS, ERRbadpath);
+                                return;
+                        }
                 }
 
@@ -3999 +4023 @@
                 base_name = p+1;
 
-        mode = dos_mode(conn,fname,&sbuf);
+        if (ms_dfs_link) {
+                mode = dos_mode_msdfs(conn,fname,&sbuf);
+        } else {
+                mode = dos_mode(conn,fname,&sbuf);
+        }
         if (!mode)
                 mode = FILE_ATTRIBUTE_NORMAL;