From 5ddec1182ec378e4560f0d98604060fdc4b6f542 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 Jan 2012 15:48:09 +1100 Subject: s3-librpc: Simplify SPNEGO code now that all mechs use a struct gensec_security Signed-off-by: Stefan Metzmacher --- source3/rpc_server/srv_pipe.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source3/rpc_server/srv_pipe.c') diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 18389b42e0..8731a28d82 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -678,10 +678,8 @@ static bool pipe_auth_generic_verify_final(TALLOC_CTX *mem_ctx, static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p) { - enum spnego_mech auth_type; struct gensec_security *gensec_security; struct spnego_context *spnego_ctx; - void *mech_ctx; NTSTATUS status; switch (p->auth.auth_type) { @@ -698,8 +696,7 @@ static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p) case DCERPC_AUTH_TYPE_SPNEGO: spnego_ctx = talloc_get_type_abort(p->auth.auth_ctx, struct spnego_context); - status = spnego_get_negotiated_mech(spnego_ctx, - &auth_type, &gensec_security); + status = spnego_get_negotiated_mech(spnego_ctx, &gensec_security); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Bad SPNEGO state (%s)\n", nt_errstr(status))); -- cgit