diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-12-26 14:23:15 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-01-05 17:17:28 +0100 |
| commit | 3042e38d519411e774e110b16a2eeeaef4b25a65 (patch) | |
| tree | e8586dd2c248ad1091c36d52bf69e031201bd0f4 /source3/smbd/negprot.c | |
| parent | 0c0c23f3fe6f7c55d69d6ca19f8252b12aa8fe5a (diff) | |
| download | samba-3042e38d519411e774e110b16a2eeeaef4b25a65.tar.gz samba-3042e38d519411e774e110b16a2eeeaef4b25a65.tar.bz2 samba-3042e38d519411e774e110b16a2eeeaef4b25a65.zip | |
s3-auth use gensec directly rather than via auth_generic_state
This is possible because the s3 gensec modules are started as
normal gensec modules, so we do not need a wrapper any more.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd/negprot.c')
| -rw-r--r-- | source3/smbd/negprot.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 0a06e4a3d7..66da049bda 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -199,18 +199,18 @@ DATA_BLOB negprot_spnego(TALLOC_CTX *ctx, struct smbd_server_connection *sconn) OID_NTLMSSP, NULL}; const char *OIDs_ntlm[] = {OID_NTLMSSP, NULL}; - struct auth_generic_state *auth_ntlmssp_state; + struct gensec_security *gensec_security; 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_generic_prepare(talloc_tos(), sconn->remote_address, - &auth_ntlmssp_state); + &gensec_security); if (NT_STATUS_IS_OK(status)) { - status = auth_generic_start(auth_ntlmssp_state, GENSEC_OID_SPNEGO); + status = gensec_start_mech_by_oid(gensec_security, GENSEC_OID_SPNEGO); if (NT_STATUS_IS_OK(status)) { - status = gensec_update(auth_ntlmssp_state->gensec_security, ctx, + status = gensec_update(gensec_security, ctx, NULL, data_blob_null, &blob); /* If we get the list of OIDs, the 'OK' answer * is NT_STATUS_MORE_PROCESSING_REQUIRED */ @@ -218,7 +218,7 @@ DATA_BLOB negprot_spnego(TALLOC_CTX *ctx, struct smbd_server_connection *sconn) sconn->use_gensec_hook = true; } } - TALLOC_FREE(auth_ntlmssp_state); + TALLOC_FREE(gensec_security); } sconn->smb1.negprot.spnego = true; |