[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  f871ff6... Fix bug 6875 - trans2 FIND_FIRST2 response --> 
FIND_FIRST2 Data -> Fille Attributes are returned as 0x220 for LANMAN2.1 
dialect Jeremy.
      from  ed99189... Fix bug 6880 - cannot list workgroup servers reported by 
Alban Browaeys <pra...@yahoo.com> with fix. Revert 
2e989bab0764c298a2530a2d4c8690258eba210c with extra comments - this broke 
workgroup enumeration. Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit f871ff6367b7bd1b49e8aab649f614fd511bfa6a
Author: Jeremy Allison <j...@samba.org>
Date:   Fri Nov 6 14:10:49 2009 -0800

    Fix bug 6875 - trans2 FIND_FIRST2 response --> FIND_FIRST2 Data -> Fille 
Attributes are returned as 0x220 for LANMAN2.1 dialect Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/dosmode.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/dosmode.c b/source/smbd/dosmode.c
index 8a5a7b0..07e1103 100644
--- a/source/smbd/dosmode.c
+++ b/source/smbd/dosmode.c
@@ -20,6 +20,8 @@
 
 #include "includes.h"
 
+extern enum protocol_types Protocol;
+
 static int set_sparse_flag(const SMB_STRUCT_STAT * const sbuf)
 {
 #if defined (HAVE_STAT_ST_BLOCKS) && defined(STAT_ST_BLOCKSIZE)
@@ -335,6 +337,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;
+       }
+
        DEBUG(8,("dos_mode_msdfs returning "));
 
        if (result & aHIDDEN) DEBUG(8, ("h"));
@@ -400,6 +408,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;
+       }
+
        DEBUG(8,("dos_mode returning "));
 
        if (result & aHIDDEN) DEBUG(8, ("h"));


-- 
Samba Shared Repository