svn commit: samba r6068 - in trunk/source/smbd: .

[jra]

Author: jra
Date: 2005-03-26 00:44:46 +0000 (Sat, 26 Mar 2005)
New Revision: 6068

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6068

Log:
Fix for bug #2541. Ensure we recognise LANMAN2.1 as OS/2 and select LANMAN2
protocol, ensure the EA size is always correctly set on a query for a file with 
no EA's.
Jeremy.

Modified:
   trunk/source/smbd/negprot.c
   trunk/source/smbd/trans2.c


Changeset:
Modified: trunk/source/smbd/negprot.c
===================================================================
--- trunk/source/smbd/negprot.c 2005-03-25 23:45:11 UTC (rev 6067)
+++ trunk/source/smbd/negprot.c 2005-03-26 00:44:46 UTC (rev 6068)
@@ -419,6 +419,7 @@
        {"NT LANMAN 1.0",           "NT1",      reply_nt1,      PROTOCOL_NT1},
        {"NT LM 0.12",              "NT1",      reply_nt1,      PROTOCOL_NT1},
        {"POSIX 2",                 "NT1",      reply_nt1,      PROTOCOL_NT1},
+       {"LANMAN2.1",               "LANMAN2",  reply_lanman2,  
PROTOCOL_LANMAN2},
        {"LM1.2X002",               "LANMAN2",  reply_lanman2,  
PROTOCOL_LANMAN2},
        {"Samba",                   "LANMAN2",  reply_lanman2,  
PROTOCOL_LANMAN2},
        {"DOS LM1.2X002",           "LANMAN2",  reply_lanman2,  
PROTOCOL_LANMAN2},

Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c  2005-03-25 23:45:11 UTC (rev 6067)
+++ trunk/source/smbd/trans2.c  2005-03-26 00:44:46 UTC (rev 6068)
@@ -237,8 +237,8 @@
 
        SMB_ASSERT(total_data_size >= 4);
 
-       SIVAL(pdata,0,0);
        if (!lp_ea_support(SNUM(conn))) {
+               SIVAL(pdata,4,0);
                return 4;
        }