From c8a3c0e0f793c622e071953b25a70a3fd8a0da65 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 11 May 2012 15:19:20 +0200
Subject: s3:smb2_negprot: setup the protocol at the end of the negprot with a
 real dialect

metze
---
 source3/smbd/smb2_negprot.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index 916b26a7f1..6d60117710 100644
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -213,10 +213,6 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
 		return smbd_smb2_request_error(req, NT_STATUS_NOT_SUPPORTED);
 	}
 
-	if (dialect != SMB2_DIALECT_REVISION_2FF) {
-		set_Protocol(protocol);
-	}
-
 	if (get_remote_arch() != RA_SAMBA) {
 		set_remote_arch(RA_VISTA);
 	}
@@ -312,9 +308,14 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
 	outdyn = security_buffer;
 
 	req->sconn->using_smb2 = true;
-	req->sconn->smb2.max_trans = max_trans;
-	req->sconn->smb2.max_read  = max_read;
-	req->sconn->smb2.max_write = max_write;
+
+	if (dialect != SMB2_DIALECT_REVISION_2FF) {
+		set_Protocol(protocol);
+
+		req->sconn->smb2.max_trans = max_trans;
+		req->sconn->smb2.max_read  = max_read;
+		req->sconn->smb2.max_write = max_write;
+	}
 
 	return smbd_smb2_request_done(req, outbody, &outdyn);
 }
-- 
cgit