diff options
| author | Jeremy Allison <jra@samba.org> | 2010-04-27 22:15:17 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-04-27 22:15:17 -0700 |
| commit | c9a3661c4b0997172782c55de4a3b15dff2c6ea4 (patch) | |
| tree | 860e3ff46b00915fd7f6dcd6f9f1558d6b1274b5 | |
| parent | 3c585e9a8068d5065b1a5f320ffd130290c1cd07 (diff) | |
| download | samba-c9a3661c4b0997172782c55de4a3b15dff2c6ea4.tar.gz samba-c9a3661c4b0997172782c55de4a3b15dff2c6ea4.tar.bz2 samba-c9a3661c4b0997172782c55de4a3b15dff2c6ea4.zip | |
Fix the "allow_smb2" bug being set to false that was driving me mad :-).
The first packet from a rebooted Win7 on an SMB2 connection is an SMB1
negprot...
Jeremy.
| -rw-r--r-- | source3/smbd/process.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 1ba1db5c5d..53c5e0b408 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1633,8 +1633,12 @@ static void process_smb(struct smbd_server_connection *conn, if (smbd_is_smb2_header(inbuf, nread)) { smbd_smb2_first_negprot(smbd_server_conn, inbuf, nread); return; + } else if (nread >= smb_size && valid_smb_header(inbuf) + && CVAL(inbuf, smb_com) != 0x72) { + /* This is a non-negprot SMB1 packet. + Disable SMB2 from now on. */ + smbd_server_conn->allow_smb2 = false; } - smbd_server_conn->allow_smb2 = false; } show_msg((char *)inbuf); |