diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-01-31 14:43:25 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-02-17 10:48:09 +0100 |
| commit | 9b147ce26d040798f2528fb85907bf18865b8c8b (patch) | |
| tree | c6cb542830d4914aa4d9fda63b6d18b29afdaa47 /source3 | |
| parent | 9c5b26f8647bd31dec9864d8c42959f81e686619 (diff) | |
| download | samba-9b147ce26d040798f2528fb85907bf18865b8c8b.tar.gz samba-9b147ce26d040798f2528fb85907bf18865b8c8b.tar.bz2 samba-9b147ce26d040798f2528fb85907bf18865b8c8b.zip | |
s3-auth Use the common gensec_ntlmssp_update in gensec_ntlmssp3_server
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/auth/auth_ntlmssp.c | 22 |
2 files changed, 3 insertions, 21 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 0425cd7b08..b4b2a98cec 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -566,8 +566,10 @@ LIBSMB_OBJ0 = \ ../auth/credentials/credentials.o \ ../auth/credentials/credentials_ntlm.o \ ../auth/credentials/credentials_samba3.o \ + ../auth/ntlmssp/ntlmssp.o \ ../auth/ntlmssp/ntlmssp_util.o \ ../auth/ntlmssp/ntlmssp_sign.o \ + ../auth/ntlmssp/ntlmssp_client.o \ ../auth/ntlmssp/gensec_ntlmssp.o \ ../auth/ntlmssp/gensec_ntlmssp_server.o \ $(LIBNDR_NTLMSSP_OBJ) \ diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c index b9d4b72222..027666fb0a 100644 --- a/source3/auth/auth_ntlmssp.c +++ b/source3/auth/auth_ntlmssp.c @@ -57,26 +57,6 @@ NTSTATUS auth3_generate_session_info(TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -static NTSTATUS gensec_ntlmssp3_server_update(struct gensec_security *gensec_security, - TALLOC_CTX *out_mem_ctx, - struct tevent_context *ev, - const DATA_BLOB request, - DATA_BLOB *reply) -{ - NTSTATUS status; - struct gensec_ntlmssp_context *gensec_ntlmssp = - talloc_get_type_abort(gensec_security->private_data, - struct gensec_ntlmssp_context); - - status = ntlmssp_update(gensec_ntlmssp->ntlmssp_state, request, reply); - if (NT_STATUS_IS_OK(status) || - NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { - talloc_steal(out_mem_ctx, reply->data); - } - - return status; -} - /** * Return the challenge as determined by the authentication subsystem * @return an 8 byte random challenge @@ -298,7 +278,7 @@ const struct gensec_security_ops gensec_ntlmssp3_server_ops = { .oid = gensec_ntlmssp3_server_oids, .server_start = gensec_ntlmssp3_server_start, .magic = gensec_ntlmssp_magic, - .update = gensec_ntlmssp3_server_update, + .update = gensec_ntlmssp_update, .sig_size = gensec_ntlmssp_sig_size, .sign_packet = gensec_ntlmssp_sign_packet, .check_packet = gensec_ntlmssp_check_packet, |