summaryrefslogtreecommitdiff
path: root/source4/auth/ntlmssp
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-12-29 16:14:05 +0100
committerStefan Metzmacher <metze@samba.org>2009-12-29 17:06:25 +0100
commitd5cbfbb93a1718b3031f37a62e350a2cd7ab0bdc (patch)
treea77e9c02e26997dd1bdd82be7f182bb50725a0f5 /source4/auth/ntlmssp
parentf31d144e70c632892ffc7d5177789947e821ad7e (diff)
downloadsamba-d5cbfbb93a1718b3031f37a62e350a2cd7ab0bdc.tar.gz
samba-d5cbfbb93a1718b3031f37a62e350a2cd7ab0bdc.tar.bz2
samba-d5cbfbb93a1718b3031f37a62e350a2cd7ab0bdc.zip
s4:ntlmssp: remove mem_ctx from check_password() callback to match s3
metze
Diffstat (limited to 'source4/auth/ntlmssp')
-rw-r--r--source4/auth/ntlmssp/ntlmssp.h1
-rw-r--r--source4/auth/ntlmssp/ntlmssp_server.c6
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;