diff options
| -rw-r--r-- | auth/common_auth.h | 6 | ||||
| -rw-r--r-- | auth/ntlmssp/ntlmssp_server.c | 53 | ||||
| -rw-r--r-- | source3/auth/auth_generic.c | 65 |
3 files changed, 32 insertions, 92 deletions
diff --git a/auth/common_auth.h b/auth/common_auth.h index 9f04c9b9cbb..0452c673ebc 100644 --- a/auth/common_auth.h +++ b/auth/common_auth.h @@ -129,12 +129,6 @@ struct auth4_context { /* Private data for the callbacks on this auth context */ void *private_data; - NTSTATUS (*check_ntlm_password)(struct auth4_context *auth_ctx, - TALLOC_CTX *mem_ctx, - const struct auth_usersupplied_info *user_info, - uint8_t *pauthoritative, - void **server_returned_info, - DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key); struct tevent_req *(*check_ntlm_password_send)(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct auth4_context *auth_ctx, diff --git a/auth/ntlmssp/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c index 29559b3fe02..001238278d7 100644 --- a/auth/ntlmssp/ntlmssp_server.c +++ b/auth/ntlmssp/ntlmssp_server.c @@ -335,8 +335,8 @@ struct tevent_req *ntlmssp_server_auth_send(TALLOC_CTX *mem_ctx, struct gensec_ntlmssp_context); struct auth4_context *auth_context = gensec_security->auth_context; struct tevent_req *req = NULL; + struct tevent_req *subreq = NULL; struct ntlmssp_server_auth_state *state = NULL; - uint8_t authoritative = 0; NTSTATUS status; req = tevent_req_create(mem_ctx, &state, @@ -355,54 +355,13 @@ struct tevent_req *ntlmssp_server_auth_send(TALLOC_CTX *mem_ctx, return tevent_req_post(req, ev); } - if (auth_context->check_ntlm_password_send != NULL) { - struct tevent_req *subreq = NULL; - - subreq = auth_context->check_ntlm_password_send(state, ev, - auth_context, - state->user_info); - if (tevent_req_nomem(subreq, req)) { - return tevent_req_post(req, ev); - } - tevent_req_set_callback(subreq, - ntlmssp_server_auth_done, - req); - return req; - } - - if (auth_context->check_ntlm_password == NULL) { - tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR); + subreq = auth_context->check_ntlm_password_send( + state, ev, auth_context, state->user_info); + if (tevent_req_nomem(subreq, req)) { return tevent_req_post(req, ev); } - - status = auth_context->check_ntlm_password(auth_context, - gensec_ntlmssp, - state->user_info, - &authoritative, - &gensec_ntlmssp->server_returned_info, - &state->user_session_key, - &state->lm_session_key); - if (!NT_STATUS_IS_OK(status)) { - DBG_INFO("Checking NTLMSSP password for %s\\%s failed: %s\n", - state->user_info->client.domain_name, - state->user_info->client.account_name, - nt_errstr(status)); - } - if (tevent_req_nterror(req, status)) { - return tevent_req_post(req, ev); - } - talloc_steal(state, state->user_session_key.data); - talloc_steal(state, state->lm_session_key.data); - - status = ntlmssp_server_postauth(gensec_security, - gensec_ntlmssp, - state, in); - if (tevent_req_nterror(req, status)) { - return tevent_req_post(req, ev); - } - - tevent_req_done(req); - return tevent_req_post(req, ev); + tevent_req_set_callback(subreq, ntlmssp_server_auth_done, req); + return req; } /** diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c index 326ca46627e..9243a0ba02d 100644 --- a/source3/auth/auth_generic.c +++ b/source3/auth/auth_generic.c @@ -415,48 +415,35 @@ NTSTATUS auth_check_password_session_info(struct auth4_context *auth_context, NTSTATUS nt_status; void *server_info; uint8_t authoritative = 0; + struct tevent_context *ev = NULL; + struct tevent_req *subreq = NULL; + bool ok; - if (auth_context->check_ntlm_password_send != NULL) { - struct tevent_context *ev = NULL; - struct tevent_req *subreq = NULL; - bool ok; - - ev = samba_tevent_context_init(talloc_tos()); - if (ev == NULL) { - return NT_STATUS_NO_MEMORY; - } + ev = samba_tevent_context_init(talloc_tos()); + if (ev == NULL) { + return NT_STATUS_NO_MEMORY; + } - subreq = auth_context->check_ntlm_password_send(ev, ev, - auth_context, - user_info); - if (subreq == NULL) { - TALLOC_FREE(ev); - return NT_STATUS_NO_MEMORY; - } - ok = tevent_req_poll_ntstatus(subreq, ev, &nt_status); - if (!ok) { - TALLOC_FREE(ev); - return nt_status; - } - nt_status = auth_context->check_ntlm_password_recv(subreq, - talloc_tos(), - &authoritative, - &server_info, - NULL, NULL); + subreq = auth_context->check_ntlm_password_send(ev, ev, + auth_context, + user_info); + if (subreq == NULL) { TALLOC_FREE(ev); - if (!NT_STATUS_IS_OK(nt_status)) { - return nt_status; - } - } else { - nt_status = auth_context->check_ntlm_password(auth_context, - talloc_tos(), - user_info, - &authoritative, - &server_info, - NULL, NULL); - if (!NT_STATUS_IS_OK(nt_status)) { - return nt_status; - } + return NT_STATUS_NO_MEMORY; + } + ok = tevent_req_poll_ntstatus(subreq, ev, &nt_status); + if (!ok) { + TALLOC_FREE(ev); + return nt_status; + } + nt_status = auth_context->check_ntlm_password_recv(subreq, + talloc_tos(), + &authoritative, + &server_info, + NULL, NULL); + TALLOC_FREE(ev); + if (!NT_STATUS_IS_OK(nt_status)) { + return nt_status; } nt_status = auth_context->generate_session_info(auth_context, |