diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpc_server/dcesrv_ntlmssp.c | 6 | ||||
| -rw-r--r-- | source3/rpc_server/dcesrv_ntlmssp.h | 6 | ||||
| -rw-r--r-- | source3/rpc_server/dcesrv_spnego.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_pipe.c | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c index 8328374581..1a637a07d1 100644 --- a/source3/rpc_server/dcesrv_ntlmssp.c +++ b/source3/rpc_server/dcesrv_ntlmssp.c @@ -82,7 +82,7 @@ done: return status; } -NTSTATUS ntlmssp_server_step(struct gensec_security *gensec_security, +NTSTATUS auth_generic_server_step(struct gensec_security *gensec_security, TALLOC_CTX *mem_ctx, DATA_BLOB *token_in, DATA_BLOB *token_out) @@ -97,7 +97,7 @@ NTSTATUS ntlmssp_server_step(struct gensec_security *gensec_security, return status; } -NTSTATUS ntlmssp_server_check_flags(struct gensec_security *gensec_security, +NTSTATUS auth_generic_server_check_flags(struct gensec_security *gensec_security, bool do_sign, bool do_seal) { if (do_sign && !gensec_have_feature(gensec_security, GENSEC_FEATURE_SIGN)) { @@ -115,7 +115,7 @@ NTSTATUS ntlmssp_server_check_flags(struct gensec_security *gensec_security, return NT_STATUS_OK; } -NTSTATUS ntlmssp_server_get_user_info(struct gensec_security *gensec_security, +NTSTATUS auth_generic_server_get_user_info(struct gensec_security *gensec_security, TALLOC_CTX *mem_ctx, struct auth_session_info **session_info) { diff --git a/source3/rpc_server/dcesrv_ntlmssp.h b/source3/rpc_server/dcesrv_ntlmssp.h index d31b6f7ee6..119e29276a 100644 --- a/source3/rpc_server/dcesrv_ntlmssp.h +++ b/source3/rpc_server/dcesrv_ntlmssp.h @@ -31,13 +31,13 @@ NTSTATUS auth_generic_server_start(TALLOC_CTX *mem_ctx, DATA_BLOB *token_out, const struct tsocket_address *remote_address, struct gensec_security **ctx); -NTSTATUS ntlmssp_server_step(struct gensec_security *ctx, +NTSTATUS auth_generic_server_step(struct gensec_security *ctx, TALLOC_CTX *mem_ctx, DATA_BLOB *token_in, DATA_BLOB *token_out); -NTSTATUS ntlmssp_server_check_flags(struct gensec_security *ctx, +NTSTATUS auth_generic_server_check_flags(struct gensec_security *ctx, bool do_sign, bool do_seal); -NTSTATUS ntlmssp_server_get_user_info(struct gensec_security *ctx, +NTSTATUS auth_generic_server_get_user_info(struct gensec_security *ctx, TALLOC_CTX *mem_ctx, struct auth_session_info **session_info); diff --git a/source3/rpc_server/dcesrv_spnego.c b/source3/rpc_server/dcesrv_spnego.c index 9f61bba990..94c282cdfc 100644 --- a/source3/rpc_server/dcesrv_spnego.c +++ b/source3/rpc_server/dcesrv_spnego.c @@ -155,7 +155,7 @@ NTSTATUS spnego_server_step(struct spnego_context *sp_ctx, mem_ctx, &token_in, &token_out); break; case SPNEGO_NTLMSSP: - status = ntlmssp_server_step( + status = auth_generic_server_step( sp_ctx->mech_ctx.gensec_security, mem_ctx, &token_in, &token_out); break; diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 68c099e74a..5b2c78ab14 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -647,7 +647,7 @@ static bool pipe_ntlmssp_verify_final(TALLOC_CTX *mem_ctx, ensure the underlying NTLMSSP flags are also set. If not we should refuse the bind. */ - status = ntlmssp_server_check_flags(gensec_security, + status = auth_generic_server_check_flags(gensec_security, (auth_level == DCERPC_AUTH_LEVEL_INTEGRITY), (auth_level == @@ -660,7 +660,7 @@ static bool pipe_ntlmssp_verify_final(TALLOC_CTX *mem_ctx, TALLOC_FREE(*session_info); - status = ntlmssp_server_get_user_info(gensec_security, + status = auth_generic_server_get_user_info(gensec_security, mem_ctx, session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, (__location__ ": failed to obtain the server info " @@ -1214,7 +1214,7 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt) case DCERPC_AUTH_TYPE_NTLMSSP: gensec_security = talloc_get_type_abort(p->auth.auth_ctx, struct gensec_security); - status = ntlmssp_server_step(gensec_security, + status = auth_generic_server_step(gensec_security, pkt, &auth_info.credentials, &response); break; @@ -1382,7 +1382,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p, case DCERPC_AUTH_TYPE_NTLMSSP: gensec_security = talloc_get_type_abort(p->auth.auth_ctx, struct gensec_security); - status = ntlmssp_server_step(gensec_security, + status = auth_generic_server_step(gensec_security, pkt, &auth_info.credentials, &auth_resp); |