From d5cbfbb93a1718b3031f37a62e350a2cd7ab0bdc Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 29 Dec 2009 16:14:05 +0100 Subject: s4:ntlmssp: remove mem_ctx from check_password() callback to match s3 metze --- source4/auth/ntlmssp/ntlmssp.h | 1 - source4/auth/ntlmssp/ntlmssp_server.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h index 3354af9dbf..7bed54d6d8 100644 --- a/source4/auth/ntlmssp/ntlmssp.h +++ b/source4/auth/ntlmssp/ntlmssp.h @@ -118,7 +118,6 @@ struct gensec_ntlmssp_state * */ NTSTATUS (*check_password)(struct gensec_ntlmssp_state *, - TALLOC_CTX *mem_ctx, DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key); const char *server_name; diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index b456337806..c49bf2fea7 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -570,7 +570,6 @@ NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security, /* Finally, actually ask if the password is OK */ nt_status = gensec_ntlmssp_state->check_password(gensec_ntlmssp_state, - NULL, &user_session_key, &lm_session_key); if (!NT_STATUS_IS_OK(nt_status)) { @@ -646,9 +645,8 @@ static NTSTATUS auth_ntlmssp_set_challenge(struct gensec_ntlmssp_state *gensec_n * Return the session keys used on the connection. */ -static NTSTATUS auth_ntlmssp_check_password(struct gensec_ntlmssp_state *gensec_ntlmssp_state, - TALLOC_CTX *mem_ctx, - DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) +static NTSTATUS auth_ntlmssp_check_password(struct gensec_ntlmssp_state *gensec_ntlmssp_state, + DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) { NTSTATUS nt_status; struct auth_usersupplied_info *user_info; -- cgit