From 1100f6eca568bdf725922eff09988559d2714e45 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 16 Dec 2011 16:08:56 +1100 Subject: s3-auth rename auth_ntlmssp_prepare() -> auth_generic_prepare() This function handles more than NTLMSSP now, at least when we are an AD DC and so changing the name may avoid some confusion in the future. Andrew Bartlett Signed-off-by: Stefan Metzmacher --- source3/smbd/negprot.c | 2 +- source3/smbd/seal.c | 2 +- source3/smbd/sesssetup.c | 6 +++--- source3/smbd/smb2_sesssetup.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index f7d277be3a..2076b094a3 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -204,7 +204,7 @@ DATA_BLOB negprot_spnego(TALLOC_CTX *ctx, struct smbd_server_connection *sconn) sconn->use_gensec_hook = false; /* See if we can get an SPNEGO blob out of the gensec hook (if auth_samba4 is loaded) */ - status = auth_ntlmssp_prepare(sconn->remote_address, + status = auth_generic_prepare(sconn->remote_address, &auth_ntlmssp_state); if (NT_STATUS_IS_OK(status)) { status = auth_generic_start(auth_ntlmssp_state, GENSEC_OID_SPNEGO); diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index ab87d76b26..fc811deb3c 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -80,7 +80,7 @@ static NTSTATUS make_auth_ntlmssp(const struct tsocket_address *remote_address, struct smb_trans_enc_state *es) { struct auth_generic_state *auth_ntlmssp_state; - NTSTATUS status = auth_ntlmssp_prepare(remote_address, + NTSTATUS status = auth_generic_prepare(remote_address, &auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { return nt_status_squash(status); diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 43ff13ec28..b7daa9e4f0 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -625,7 +625,7 @@ static void reply_spnego_negotiate(struct smb_request *req, return; } - status = auth_ntlmssp_prepare(sconn->remote_address, + status = auth_generic_prepare(sconn->remote_address, auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { /* Kill the intermediate vuid */ @@ -737,7 +737,7 @@ static void reply_spnego_auth(struct smb_request *req, data_blob_free(&secblob); if (!*auth_ntlmssp_state) { - status = auth_ntlmssp_prepare(sconn->remote_address, + status = auth_generic_prepare(sconn->remote_address, auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { /* Kill the intermediate vuid */ @@ -1145,7 +1145,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) DATA_BLOB chal; if (!vuser->auth_ntlmssp_state) { - status = auth_ntlmssp_prepare(sconn->remote_address, + status = auth_generic_prepare(sconn->remote_address, &vuser->auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { /* Kill the intermediate vuid */ diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index f2ce989eb6..a6ff31b5bf 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -375,7 +375,7 @@ static NTSTATUS smbd_smb2_spnego_negotiate(struct smbd_smb2_session *session, status = NT_STATUS_MORE_PROCESSING_REQUIRED; } else { /* Fall back to NTLMSSP. */ - status = auth_ntlmssp_prepare(session->sconn->remote_address, + status = auth_generic_prepare(session->sconn->remote_address, &session->auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { goto out; @@ -564,7 +564,7 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session, } if (session->auth_ntlmssp_state == NULL) { - status = auth_ntlmssp_prepare(session->sconn->remote_address, + status = auth_generic_prepare(session->sconn->remote_address, &session->auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { data_blob_free(&auth); @@ -641,7 +641,7 @@ static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct smbd_smb2_session *session, *out_security_buffer = data_blob_null; if (session->auth_ntlmssp_state == NULL) { - status = auth_ntlmssp_prepare(session->sconn->remote_address, + status = auth_generic_prepare(session->sconn->remote_address, &session->auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(session); -- cgit