svn commit: samba r16735 - in branches/SAMBA_4_0/source/smb_server/smb: .

[metze at samba.org]

Author: metze
Date: 2006-07-01 14:18:20 +0000 (Sat, 01 Jul 2006)
New Revision: 16735

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16735

Log:
vista beta2 reuses the tcp connect where it does the
SMB negprot

metze
Modified:
   branches/SAMBA_4_0/source/smb_server/smb/negprot.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb/negprot.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/negprot.c	2006-07-01 14:14:11 UTC (rev 16734)
+++ branches/SAMBA_4_0/source/smb_server/smb/negprot.c	2006-07-01 14:18:20 UTC (rev 16735)
@@ -421,18 +421,6 @@
 	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 @@
 	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 */