r6069: 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.
(This used to be commit d6ad1f8df05e16152d9c95df56e612fde288d3b4)

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 9aaa818c62a2449e7bb1ed30623a55d62a4934e9..bdb15cb3f7cb970ce2f3097c460a4f4799844a74 100644 (file)
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -419,6 +419,7 @@ static const struct {
        {"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},

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b1beed82acdb6043c18553f574631e86d21fdf1c..77f879b53df327194294803423592595d9be3744 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -237,8 +237,8 @@ static unsigned int fill_ea_buffer(TALLOC_CTX *mem_ctx, char *pdata, unsigned in
 
        SMB_ASSERT(total_data_size >= 4);
 
-       SIVAL(pdata,0,0);
        if (!lp_ea_support(SNUM(conn))) {
+               SIVAL(pdata,4,0);
                return 4;
        }