diff options
| author | Jeremy Allison <jra@samba.org> | 2005-03-26 00:44:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:20 -0500 |
| commit | 404fa5636ddae8caa0a46bb68b796d23ec3f5a0e (patch) | |
| tree | 98483d9875d414d9931c76094443185f2654a318 | |
| parent | e2204e24ba39f90fdea6a4de458f81373368eb42 (diff) | |
| download | samba-404fa5636ddae8caa0a46bb68b796d23ec3f5a0e.tar.gz samba-404fa5636ddae8caa0a46bb68b796d23ec3f5a0e.tar.bz2 samba-404fa5636ddae8caa0a46bb68b796d23ec3f5a0e.zip | |
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)
| -rw-r--r-- | source3/smbd/negprot.c | 1 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 9aaa818c62..bdb15cb3f7 100644 --- 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 b1beed82ac..77f879b53d 100644 --- 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; } |