diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-18 21:13:16 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-10-21 08:43:10 +0200 |
| commit | 083025ccd53fe3ee90fcc81eb8d4c566e11fd6ac (patch) | |
| tree | 7352125c6a227d7a7d1224e2bfb00de7386f0fc7 /source3/smbd/seal.c | |
| parent | 915fe7981b48537bb000ae5f90e630caacf657e0 (diff) | |
| download | samba-083025ccd53fe3ee90fcc81eb8d4c566e11fd6ac.tar.gz samba-083025ccd53fe3ee90fcc81eb8d4c566e11fd6ac.tar.bz2 samba-083025ccd53fe3ee90fcc81eb8d4c566e11fd6ac.zip | |
s3-ntlmssp Remove auth_ntlmssp_update wrapper
We now just call gensec_update directly.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd/seal.c')
| -rw-r--r-- | source3/smbd/seal.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index f68b6c7a8f..73efc6ceff 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -28,6 +28,7 @@ #include "auth.h" #include "libsmb/libsmb.h" #include "../lib/tsocket/tsocket.h" +#include "auth/gensec/gensec.h" /****************************************************************************** Server side encryption. @@ -488,9 +489,9 @@ static NTSTATUS srv_enc_ntlm_negotiate(const struct tsocket_address *remote_addr return status; } - status = auth_ntlmssp_update(partial_srv_trans_enc_ctx->auth_ntlmssp_state, - talloc_tos(), - secblob, &chal); + status = gensec_update(partial_srv_trans_enc_ctx->auth_ntlmssp_state->gensec_security, + talloc_tos(), NULL, + secblob, &chal); /* status here should be NT_STATUS_MORE_PROCESSING_REQUIRED * for success ... */ @@ -613,7 +614,7 @@ static NTSTATUS srv_enc_spnego_ntlm_auth(connection_struct *conn, return NT_STATUS_INVALID_PARAMETER; } - status = auth_ntlmssp_update(ec->auth_ntlmssp_state, talloc_tos(), auth, &auth_reply); + status = gensec_update(ec->auth_ntlmssp_state->gensec_security, talloc_tos(), NULL, auth, &auth_reply); data_blob_free(&auth); /* From RFC4178. @@ -683,9 +684,9 @@ static NTSTATUS srv_enc_raw_ntlm_auth(connection_struct *conn, } /* Second step. */ - status = auth_ntlmssp_update(partial_srv_trans_enc_ctx->auth_ntlmssp_state, - talloc_tos(), - blob, &response); + status = gensec_update(partial_srv_trans_enc_ctx->auth_ntlmssp_state->gensec_security, + talloc_tos(), NULL, + blob, &response); if (NT_STATUS_IS_OK(status)) { /* Return the context we're using for this encryption state. */ |