From 77c73a5ec92f9294195dfef977f66dfe66182c6d Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 3 Sep 2010 09:38:57 -0400 Subject: spnego: make spnego_context public MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Günther Deschner --- source3/librpc/crypto/cli_spnego.c | 19 ------------------- source3/librpc/crypto/spnego.h | 21 +++++++++++++++++++-- 2 files changed, 19 insertions(+), 21 deletions(-) (limited to 'source3') diff --git a/source3/librpc/crypto/cli_spnego.c b/source3/librpc/crypto/cli_spnego.c index 04a0922197..60e9e8012f 100644 --- a/source3/librpc/crypto/cli_spnego.c +++ b/source3/librpc/crypto/cli_spnego.c @@ -24,25 +24,6 @@ #include "librpc/crypto/gse.h" #include "librpc/crypto/spnego.h" -struct spnego_context { - enum spnego_mech mech; - - bool do_sign; - bool do_seal; - - union { - struct auth_ntlmssp_state *ntlmssp_state; - struct gse_context *gssapi_state; - } mech_ctx; - - enum { - SPNEGO_CONV_INIT = 0, - SPNEGO_CONV_AUTH_MORE, - SPNEGO_CONV_AUTH_CONFIRM, - SPNEGO_CONV_AUTH_DONE - } state; -}; - static NTSTATUS spnego_context_init(TALLOC_CTX *mem_ctx, bool do_sign, bool do_seal, struct spnego_context **spnego_ctx) diff --git a/source3/librpc/crypto/spnego.h b/source3/librpc/crypto/spnego.h index e2a00b6ef6..9512ed6324 100644 --- a/source3/librpc/crypto/spnego.h +++ b/source3/librpc/crypto/spnego.h @@ -20,14 +20,31 @@ #ifndef _CLI_SPNEGO_H_ #define _CLI_SPENGO_H_ -struct spnego_context; - enum spnego_mech { SPNEGO_NONE = 0, SPNEGO_KRB5, SPNEGO_NTLMSSP }; +struct spnego_context { + enum spnego_mech mech; + + union { + struct auth_ntlmssp_state *ntlmssp_state; + struct gse_context *gssapi_state; + } mech_ctx; + + enum { + SPNEGO_CONV_INIT = 0, + SPNEGO_CONV_AUTH_MORE, + SPNEGO_CONV_AUTH_CONFIRM, + SPNEGO_CONV_AUTH_DONE + } state; + + bool do_sign; + bool do_seal; +}; + NTSTATUS spnego_gssapi_init_client(TALLOC_CTX *mem_ctx, bool do_sign, bool do_seal, bool is_dcerpc, -- cgit