summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-12-16 16:38:53 +1100
committerStefan Metzmacher <metze@samba.org>2011-12-22 19:25:10 +0100
commitc17131685cc7febea6f09c7029c26e9993f8bc91 (patch)
treeff1b1eeff6ea82ee756a6f61265c569cb038832b
parent1100f6eca568bdf725922eff09988559d2714e45 (diff)
downloadsamba-c17131685cc7febea6f09c7029c26e9993f8bc91.tar.gz
samba-c17131685cc7febea6f09c7029c26e9993f8bc91.tar.bz2
samba-c17131685cc7febea6f09c7029c26e9993f8bc91.zip
s3-auth remove auth_ntlmssp_start(), call auth_generic_start() directly
This makes it clear that this can support more than just NTLMSSP. Andrew Bartlett Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/auth/auth_ntlmssp.c5
-rw-r--r--source3/rpc_server/dcesrv_ntlmssp.c4
-rw-r--r--source3/smbd/seal.c2
-rw-r--r--source3/smbd/sesssetup.c6
-rw-r--r--source3/smbd/smb2_sesssetup.c6
5 files changed, 9 insertions, 14 deletions
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 0f09ae1021..6ca6be7c89 100644
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -457,8 +457,3 @@ NTSTATUS auth_generic_authtype_start(struct auth_generic_state *auth_ntlmssp_sta
return NT_STATUS_OK;
}
-
-NTSTATUS auth_ntlmssp_start(struct auth_generic_state *auth_ntlmssp_state)
-{
- return auth_generic_start(auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
-}
diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c
index 9a471506a8..a7ba58692b 100644
--- a/source3/rpc_server/dcesrv_ntlmssp.c
+++ b/source3/rpc_server/dcesrv_ntlmssp.c
@@ -57,9 +57,9 @@ NTSTATUS ntlmssp_server_auth_start(TALLOC_CTX *mem_ctx,
gensec_want_feature(a->gensec_security, GENSEC_FEATURE_DCE_STYLE);
}
- status = auth_ntlmssp_start(a);
+ status = auth_generic_start(a, GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, (__location__ ": auth_ntlmssp_start failed: %s\n",
+ DEBUG(0, (__location__ ": auth_generic_start failed: %s\n",
nt_errstr(status)));
return status;
}
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index fc811deb3c..be5f9506d0 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -88,7 +88,7 @@ static NTSTATUS make_auth_ntlmssp(const struct tsocket_address *remote_address,
gensec_want_feature(auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SEAL);
- status = auth_ntlmssp_start(auth_ntlmssp_state);
+ status = auth_generic_start(auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(auth_ntlmssp_state);
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index b7daa9e4f0..04783a4fcd 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -636,7 +636,7 @@ static void reply_spnego_negotiate(struct smb_request *req,
gensec_want_feature((*auth_ntlmssp_state)->gensec_security, GENSEC_FEATURE_SESSION_KEY);
- status = auth_ntlmssp_start(*auth_ntlmssp_state);
+ status = auth_generic_start(*auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
/* Kill the intermediate vuid */
invalidate_vuid(sconn, vuid);
@@ -748,7 +748,7 @@ static void reply_spnego_auth(struct smb_request *req,
gensec_want_feature((*auth_ntlmssp_state)->gensec_security, GENSEC_FEATURE_SESSION_KEY);
- status = auth_ntlmssp_start(*auth_ntlmssp_state);
+ status = auth_generic_start(*auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
/* Kill the intermediate vuid */
invalidate_vuid(sconn, vuid);
@@ -1160,7 +1160,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
if (sconn->use_gensec_hook) {
status = auth_generic_start(vuser->auth_ntlmssp_state, GENSEC_OID_SPNEGO);
} else {
- status = auth_ntlmssp_start(vuser->auth_ntlmssp_state);
+ status = auth_generic_start(vuser->auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
}
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 a6ff31b5bf..e5765dda55 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -383,7 +383,7 @@ static NTSTATUS smbd_smb2_spnego_negotiate(struct smbd_smb2_session *session,
gensec_want_feature(session->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SESSION_KEY);
- status = auth_ntlmssp_start(session->auth_ntlmssp_state);
+ status = auth_generic_start(session->auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
goto out;
}
@@ -574,7 +574,7 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
gensec_want_feature(session->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SESSION_KEY);
- status = auth_ntlmssp_start(session->auth_ntlmssp_state);
+ status = auth_generic_start(session->auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
data_blob_free(&auth);
TALLOC_FREE(session);
@@ -653,7 +653,7 @@ static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct smbd_smb2_session *session,
if (session->sconn->use_gensec_hook) {
status = auth_generic_start(session->auth_ntlmssp_state, GENSEC_OID_SPNEGO);
} else {
- status = auth_ntlmssp_start(session->auth_ntlmssp_state);
+ status = auth_generic_start(session->auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
}
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(session);