From 815490d3e8e6e254d2d199c84ecf68df76f31c6d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 21 Dec 2011 14:32:43 +1100 Subject: [PATCH] s3-rpc_server rename ntlmssp_server_auth_start() -> auth_generic_server_start() By adding an OID parameter we can make this routine generic to any gensec module that may be made available. Andrew Bartlett Signed-off-by: Stefan Metzmacher --- source3/rpc_server/dcesrv_ntlmssp.c | 5 +++-- source3/rpc_server/dcesrv_ntlmssp.h | 3 ++- source3/rpc_server/dcesrv_spnego.c | 3 ++- source3/rpc_server/srv_pipe.c | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c index c1ea388b89..8328374581 100644 --- a/source3/rpc_server/dcesrv_ntlmssp.c +++ b/source3/rpc_server/dcesrv_ntlmssp.c @@ -25,7 +25,8 @@ #include "auth.h" #include "auth/gensec/gensec.h" -NTSTATUS ntlmssp_server_auth_start(TALLOC_CTX *mem_ctx, +NTSTATUS auth_generic_server_start(TALLOC_CTX *mem_ctx, + const char *oid, bool do_sign, bool do_seal, bool is_dcerpc, @@ -56,7 +57,7 @@ NTSTATUS ntlmssp_server_auth_start(TALLOC_CTX *mem_ctx, gensec_want_feature(a->gensec_security, GENSEC_FEATURE_DCE_STYLE); } - status = auth_generic_start(a, GENSEC_OID_NTLMSSP); + status = auth_generic_start(a, oid); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, (__location__ ": auth_generic_start failed: %s\n", nt_errstr(status))); diff --git a/source3/rpc_server/dcesrv_ntlmssp.h b/source3/rpc_server/dcesrv_ntlmssp.h index 6efc68d78c..d31b6f7ee6 100644 --- a/source3/rpc_server/dcesrv_ntlmssp.h +++ b/source3/rpc_server/dcesrv_ntlmssp.h @@ -22,7 +22,8 @@ struct gensec_security; -NTSTATUS ntlmssp_server_auth_start(TALLOC_CTX *mem_ctx, +NTSTATUS auth_generic_server_start(TALLOC_CTX *mem_ctx, + const char *oid, bool do_sign, bool do_seal, bool is_dcerpc, diff --git a/source3/rpc_server/dcesrv_spnego.c b/source3/rpc_server/dcesrv_spnego.c index 88ffdf7b5f..9f61bba990 100644 --- a/source3/rpc_server/dcesrv_spnego.c +++ b/source3/rpc_server/dcesrv_spnego.c @@ -77,7 +77,8 @@ static NTSTATUS spnego_server_mech_init(struct spnego_context *sp_ctx, break; case SPNEGO_NTLMSSP: - status = ntlmssp_server_auth_start(sp_ctx, + status = auth_generic_server_start(sp_ctx, + OID_NTLMSSP, sp_ctx->do_sign, sp_ctx->do_seal, sp_ctx->is_dcerpc, diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index b32e1e1d48..68c099e74a 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -598,7 +598,8 @@ static bool pipe_ntlmssp_auth_bind(struct pipes_struct *p, } /* We have an NTLMSSP blob. */ - status = ntlmssp_server_auth_start(p, + status = auth_generic_server_start(p, + OID_NTLMSSP, (auth_info->auth_level == DCERPC_AUTH_LEVEL_INTEGRITY), (auth_info->auth_level == -- 2.34.1