summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-08-06 18:18:51 +1000
committerGünther Deschner <gd@samba.org>2010-08-10 12:13:00 +0200
commite0c94d14b3ddc6f20e8f37b2a01b045ca2ad7375 (patch)
tree39e71b86be566f13d24d8df72bb087868e006baf
parent78fa58f8c36a111b5231a979aaa8b89a29ec815f (diff)
downloadsamba-e0c94d14b3ddc6f20e8f37b2a01b045ca2ad7375.tar.gz
samba-e0c94d14b3ddc6f20e8f37b2a01b045ca2ad7375.tar.bz2
samba-e0c94d14b3ddc6f20e8f37b2a01b045ca2ad7375.zip
s3:ntlmssp Redirect lp_lanman_auth() via 'allow_lm_key'
This will allow this to be handled via common code in the future Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--source3/libsmb/ntlmssp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 784a347803..906d743b91 100644
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -325,7 +325,7 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
}
}
- ntlmssp_handle_neg_flags(ntlmssp_state, neg_flags, lp_lanman_auth());
+ ntlmssp_handle_neg_flags(ntlmssp_state, neg_flags, ntlmssp_state->allow_lm_key);
/* Ask our caller what challenge they would like in the packet */
status = ntlmssp_state->get_challenge(ntlmssp_state, cryptkey);
@@ -518,7 +518,7 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
}
if (auth_flags)
- ntlmssp_handle_neg_flags(ntlmssp_state, auth_flags, lp_lanman_auth());
+ ntlmssp_handle_neg_flags(ntlmssp_state, auth_flags, ntlmssp_state->allow_lm_key);
if (DEBUGLEVEL >= 10) {
struct AUTHENTICATE_MESSAGE *authenticate = talloc(
@@ -744,6 +744,8 @@ NTSTATUS ntlmssp_server_start(TALLOC_CTX *mem_ctx,
ntlmssp_state->expected_state = NTLMSSP_NEGOTIATE;
+ ntlmssp_state->allow_lm_key = lp_lanman_auth();
+
ntlmssp_state->neg_flags =
NTLMSSP_NEGOTIATE_128 |
NTLMSSP_NEGOTIATE_56 |