The branch, v3-6-test has been updated
via 8c66926... Fix bug #7608 - Win7 SMB2 authentication causes smbd
panic
from 14328a4... s3-netlogon: remove global include of netlogon.h.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 8c66926a39e2abe34b4b7c4c4f4a6a1f1e51f8fd
Author: Jeremy Allison <[email protected]>
Date: Mon Aug 9 16:16:24 2010 -0700
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.
(cherry picked from commit e0f79dabee39c3f3e49823055c3a30929278a294)
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/smb2_sesssetup.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 8e8e26c..463f6e5 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);
}
--
Samba Shared Repository
