Second part of fix for 6875 - trans2 FIND_FIRST2 response --> FIND_FIRST2 Data -...

Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the returned attributes by protocol level.
This makes us consistant in returning DOS attrs across all replies. Tested on OS/2 by Günter Kukkukk.
Jeremy.
(cherry picked from commit b53ee9ffe9d265e254a2c0b11bfcd7e6314ab13f)

diff --git a/source/smbd/dosmode.c b/source/smbd/dosmode.c
index 07e1103dc9badc5113d05b5500a3203abc096850..c7c9f3eae9ca6d7837c7c2e9117bc2b62ff2347b 100644 (file)
--- a/source/smbd/dosmode.c
+++ b/source/smbd/dosmode.c
@@ -22,6 +22,18 @@
 
 extern enum protocol_types Protocol;
 
+static uint32_t filter_mode_by_protocol(uint32_t mode)
+{
+       if (Protocol <= PROTOCOL_LANMAN2) {
+               DEBUG(10,("filter_mode_by_protocol: "
+                       "filtering result 0x%x to 0x%x\n",
+                       (unsigned int)mode,
+                       (unsigned int)(mode & 0x3f) ));
+               mode &= 0x3f;
+       }
+       return mode;
+}
+
 static int set_sparse_flag(const SMB_STRUCT_STAT * const sbuf)
 {
 #if defined (HAVE_STAT_ST_BLOCKS) && defined(STAT_ST_BLOCKSIZE)
@@ -337,12 +349,12 @@ uint32 dos_mode_msdfs(connection_struct *conn, const char *path,SMB_STRUCT_STAT
                result |= aHIDDEN;
        }
 
-       if (Protocol <= PROTOCOL_LANMAN2) {
-               DEBUG(10,("dos_mode_msdfs : filtering result 0x%x\n",
-                       (unsigned int)result ));
-               result &= 0xff;
+       if (result == 0) {
+               result = FILE_ATTRIBUTE_NORMAL;
        }
 
+       result = filter_mode_by_protocol(result);
+
        DEBUG(8,("dos_mode_msdfs returning "));
 
        if (result & aHIDDEN) DEBUG(8, ("h"));
@@ -408,12 +420,12 @@ uint32 dos_mode(connection_struct *conn, const char *path,SMB_STRUCT_STAT *sbuf)
                result |= aHIDDEN;
        }
 
-       if (Protocol <= PROTOCOL_LANMAN2) {
-               DEBUG(10,("dos_mode : filtering result 0x%x\n",
-                       (unsigned int)result ));
-               result &= 0xff;
+       if (result == 0) {
+               result = FILE_ATTRIBUTE_NORMAL;
        }
 
+       result = filter_mode_by_protocol(result);
+
        DEBUG(8,("dos_mode returning "));
 
        if (result & aHIDDEN) DEBUG(8, ("h"));

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 21f70d015fbcee78caec28840e59506f4b62f8ed..4d6d55c57137450131f6cf5bcac0a35361a0b829 100644 (file)
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -1269,7 +1269,6 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
        char *nameptr;
        char *last_entry_ptr;
        bool was_8_3;
-       uint32 nt_extmode; /* Used for NT connections instead of mode */
        bool needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
        bool check_mangled_names = lp_manglednames(conn->params);
        char mangled_name[13]; /* mangled 8.3 name. */
@@ -1456,8 +1455,6 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
        p = pdata;
        last_entry_ptr = p;
 
-       nt_extmode = mode ? mode : FILE_ATTRIBUTE_NORMAL;
-
        switch (info_level) {
                case SMB_FIND_INFO_STANDARD:
                        DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_INFO_STANDARD\n"));
@@ -1604,7 +1601,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
                        put_long_date_timespec(p,mdate_ts); p += 8;
                        SOFF_T(p,0,file_size); p += 8;
                        SOFF_T(p,0,allocation_size); p += 8;
-                       SIVAL(p,0,nt_extmode); p += 4;
+                       SIVAL(p,0,mode); p += 4;
                        q = p; p += 4; /* q is placeholder for name length. */
                        {
                                unsigned int ea_size = estimate_ea_size(conn, NULL, pathreal);
@@ -1655,7 +1652,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
                        put_long_date_timespec(p,mdate_ts); p += 8;
                        SOFF_T(p,0,file_size); p += 8;
                        SOFF_T(p,0,allocation_size); p += 8;
-                       SIVAL(p,0,nt_extmode); p += 4;
+                       SIVAL(p,0,mode); p += 4;
                        len = srvstr_push(base_data, flags2,
                                          p + 4, fname, PTR_DIFF(end_data, p+4),
                                          STR_TERMINATE_ASCII);
@@ -1678,7 +1675,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
                        put_long_date_timespec(p,mdate_ts); p += 8;
                        SOFF_T(p,0,file_size); p += 8;
                        SOFF_T(p,0,allocation_size); p += 8;
-                       SIVAL(p,0,nt_extmode); p += 4;
+                       SIVAL(p,0,mode); p += 4;
                        q = p; p += 4; /* q is placeholder for name length. */
                        {
                                unsigned int ea_size = estimate_ea_size(conn, NULL, pathreal);
@@ -1727,7 +1724,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
                        put_long_date_timespec(p,mdate_ts); p += 8;
                        SOFF_T(p,0,file_size); p += 8;
                        SOFF_T(p,0,allocation_size); p += 8;
-                       SIVAL(p,0,nt_extmode); p += 4;
+                       SIVAL(p,0,mode); p += 4;
                        q = p; p += 4; /* q is placeholder for name length. */
                        {
                                unsigned int ea_size = estimate_ea_size(conn, NULL, pathreal);
@@ -1760,7 +1757,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
                        put_long_date_timespec(p,mdate_ts); p += 8;
                        SOFF_T(p,0,file_size); p += 8;
                        SOFF_T(p,0,allocation_size); p += 8;
-                       SIVAL(p,0,nt_extmode); p += 4;
+                       SIVAL(p,0,mode); p += 4;
                        q = p; p += 4; /* q is placeholder for name length */
                        {
                                unsigned int ea_size = estimate_ea_size(conn, NULL, pathreal);
@@ -4071,8 +4068,6 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
        } else {
                mode = dos_mode(conn,fname,&sbuf);
        }
-       if (!mode)
-               mode = FILE_ATTRIBUTE_NORMAL;
 
        nlink = sbuf.st_nlink;