Index: smbd/negprot.c
===================================================================
--- smbd/negprot.c	(revision 6062)
+++ smbd/negprot.c	(working copy)
@@ -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},
Index: smbd/trans2.c
===================================================================
--- smbd/trans2.c	(revision 6067)
+++ smbd/trans2.c	(working copy)
@@ -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;
 	}