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/libsmb | |
| 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/libsmb')
| -rw-r--r-- | source3/libsmb/clifsinfo.c | 5 | ||||
| -rw-r--r-- | source3/libsmb/ntlmssp_wrap.c | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index b312cfbd48..fa8dba5fbd 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -27,6 +27,7 @@ #include "smb_crypt.h" #include "trans2.h" #include "ntlmssp_wrap.h" +#include "auth/gensec/gensec.h" /**************************************************************************** Get UNIX extensions version info. @@ -637,8 +638,8 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli, } do { - status = auth_ntlmssp_update(es->s.auth_ntlmssp_state, es->s.auth_ntlmssp_state, - blob_in, &blob_out); + status = gensec_update(es->s.auth_ntlmssp_state->gensec_security, es->s.auth_ntlmssp_state, + NULL, blob_in, &blob_out); data_blob_free(&blob_in); data_blob_free(¶m_out); if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED) || NT_STATUS_IS_OK(status)) { diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c index 3d1d099a58..af5f2c9f68 100644 --- a/source3/libsmb/ntlmssp_wrap.c +++ b/source3/libsmb/ntlmssp_wrap.c @@ -127,13 +127,6 @@ DATA_BLOB auth_ntlmssp_get_session_key(struct auth_ntlmssp_state *ans, TALLOC_CT } } -NTSTATUS auth_ntlmssp_update(struct auth_ntlmssp_state *ans, - TALLOC_CTX *mem_ctx, - const DATA_BLOB request, DATA_BLOB *reply) -{ - return gensec_update(ans->gensec_security, mem_ctx, NULL, request, reply); -} - static NTSTATUS gensec_ntlmssp3_client_update(struct gensec_security *gensec_security, TALLOC_CTX *out_mem_ctx, struct tevent_context *ev, |