Changeset 370 for branches/samba-3.3.x/source/smbd/dosmode.c

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

File:

• branches/samba-3.3.x/source/smbd/dosmode.c (modified) (3 diffs)

branches/samba-3.3.x/source/smbd/dosmode.c

@@ -20 +20 @@
 
 #include "includes.h"
+
+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)
@@ -361 +375 @@
         }
 
+        if (result == 0) {
+                result = FILE_ATTRIBUTE_NORMAL;
+        }
+
+        result = filter_mode_by_protocol(result);
+
         DEBUG(8,("dos_mode_msdfs returning "));
 
@@ -425 +445 @@
                 result |= aHIDDEN;
         }
+
+        if (result == 0) {
+                result = FILE_ATTRIBUTE_NORMAL;
+        }
+
+        result = filter_mode_by_protocol(result);
 
         DEBUG(8,("dos_mode returning "));