From: Jeremy Allison <jra@samba.org>
Date: Mon, 9 Aug 2010 23:16:24 +0000 (-0700)
Subject: Fix bug #7608 - Win7 SMB2 authentication causes smbd panic
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=e0f79dabee39c3f3e49823055c3a30929278a294;p=mat%2Fsamba.git

Fix bug #7608 - Win7 SMB2 authentication causes smbd panic

We need to call setup_ntlmssp_server_info() if status==NT_STATUS_OK,
or if status is anything except NT_STATUS_MORE_PROCESSING_REQUIRED,
as this can trigger map to guest.

Jeremy.
---

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 3ca7ae7638..c51a0fd039 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -787,8 +787,10 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
 	status = auth_ntlmssp_update(session->auth_ntlmssp_state,
 				     auth,
 				     &auth_out);
-	if (!NT_STATUS_IS_OK(status) &&
-			!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+	/* We need to call setup_ntlmssp_server_info() if status==NT_STATUS_OK,
+	   or if status is anything except NT_STATUS_MORE_PROCESSING_REQUIRED,
+	   as this can trigger map to guest. */
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
 		status = setup_ntlmssp_server_info(session, status);
 	}