From 915fe7981b48537bb000ae5f90e630caacf657e0 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 18 Oct 2011 20:58:47 +1100 Subject: s3-auth remove auth_ntlmssp_session_info() Instead, call gensec_session_info() directly. Andrew Bartlett Signed-off-by: Stefan Metzmacher --- source3/smbd/sesssetup.c | 5 +++-- source3/smbd/smb2_sesssetup.c | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 4d48e73f92..a5f2030ee5 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -431,8 +431,9 @@ static void reply_spnego_ntlmssp(struct smb_request *req, struct smbd_server_connection *sconn = req->sconn; if (NT_STATUS_IS_OK(nt_status)) { - nt_status = auth_ntlmssp_session_info(talloc_tos(), - (*auth_ntlmssp_state), &session_info); + nt_status = gensec_session_info((*auth_ntlmssp_state)->gensec_security, + talloc_tos(), + &session_info); } reply_outbuf(req, 4, 0); diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index ece5de1282..aa898eaad7 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -588,9 +588,9 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session, /* If status is NT_STATUS_OK then we need to get the token. * Map to guest is now internal to auth_ntlmssp */ if (NT_STATUS_IS_OK(status)) { - status = auth_ntlmssp_session_info(session, - session->auth_ntlmssp_state, - &session->session_info); + status = gensec_session_info(session->auth_ntlmssp_state->gensec_security, + session, + &session->session_info); } if (!NT_STATUS_IS_OK(status) && @@ -671,9 +671,9 @@ static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct smbd_smb2_session *session, return status; } - status = auth_ntlmssp_session_info(session, - session->auth_ntlmssp_state, - &session->session_info); + status = gensec_session_info(session->auth_ntlmssp_state->gensec_security, + session, + &session->session_info); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(session->auth_ntlmssp_state); -- cgit