sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

s3-auth Use the common gensec_ntlmssp_update in gensec_ntlmssp3_server

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2012-01-31 14:43:25 +11:00 committed by Stefan Metzmacher
parent 9c5b26f864
commit 9b147ce26d
4 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
auth/ntlmssp/ntlmssp.c
View File

@ -138,10 +138,10 @@ static NTSTATUS gensec_ntlmssp_update_find(struct ntlmssp_state *ntlmssp_state,
* or NT_STATUS_OK if the user is authenticated.
*/
static NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security,
TALLOC_CTX *out_mem_ctx,
struct tevent_context *ev,
const DATA_BLOB input, DATA_BLOB *out)
NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security,
TALLOC_CTX *out_mem_ctx,
struct tevent_context *ev,
const DATA_BLOB input, DATA_BLOB *out)
{
struct gensec_ntlmssp_context *gensec_ntlmssp =
talloc_get_type_abort(gensec_security->private_data,

7
auth/ntlmssp/ntlmssp_private.h
View File

@ -43,6 +43,13 @@ union ntlmssp_crypt_state {
/* The following definitions come from auth/ntlmssp.c */
NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security,
TALLOC_CTX *out_mem_ctx,
struct tevent_context *ev,
const DATA_BLOB input, DATA_BLOB *out);
/* The following definitions come from auth/ntlmssp_util.c */
void debug_ntlmssp_flags(uint32_t neg_flags);
void ntlmssp_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
uint32_t neg_flags, bool allow_lm);

2
source3/Makefile.in
View File

@ -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) \

22
source3/auth/auth_ntlmssp.c
View File

@ -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,