diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-07-01 14:18:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:42 -0500 |
| commit | 2400ebc428995f1cccd2e5d68c2db7c47224e5d0 (patch) | |
| tree | b74613ef52a8399bd290be4f5c43e4867435df56 /source4/smb_server/smb/negprot.c | |
| parent | 6acd9aed93b09b74e53a3b854085c6c8fab41819 (diff) | |
| download | samba-2400ebc428995f1cccd2e5d68c2db7c47224e5d0.tar.gz samba-2400ebc428995f1cccd2e5d68c2db7c47224e5d0.tar.bz2 samba-2400ebc428995f1cccd2e5d68c2db7c47224e5d0.zip | |
r16735: vista beta2 reuses the tcp connect where it does the
SMB negprot
metze
(This used to be commit 3b2936a4313abedfe2029330a8f8149372050a2a)
Diffstat (limited to 'source4/smb_server/smb/negprot.c')
| -rw-r--r-- | source4/smb_server/smb/negprot.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c index 29e6c0736f..3af80c2d63 100644 --- a/source4/smb_server/smb/negprot.c +++ b/source4/smb_server/smb/negprot.c @@ -421,18 +421,6 @@ static void reply_nt1(struct smbsrv_request *req, uint16_t choice) smbsrv_send_reply_nosign(req); } -/* - after a SMB2 2.001 negprot reply to a SMB negprot request - no (SMB or SMB2) requests are allowed anymore, - vista resets the connection in this case -*/ -static NTSTATUS smbsrv_recv_disabled_request(void *private, DATA_BLOB blob) -{ - struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); - smbsrv_terminate_connection(smb_conn, "Receive Packet after SMB -> SMB2 negprot"); - return NT_STATUS_OK; -} - /**************************************************************************** Reply for the SMB2 2.001 protocol ****************************************************************************/ @@ -441,11 +429,9 @@ static void reply_smb2(struct smbsrv_request *req, uint16_t choice) struct smbsrv_connection *smb_conn = req->smb_conn; /* reply with a SMB2 packet */ + packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request); smb2srv_reply_smb_negprot(req); req = NULL; - - /* disallow requests */ - packet_set_callback(smb_conn->packet, smbsrv_recv_disabled_request); } /* List of supported protocols, most desired first */ |