From 59722ef2fb6973ac06de5c17c3f84995bac20816 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 2 Sep 2010 17:43:21 -0400 Subject: spnego: avoid explicit dependency on dcerpc specific structures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Günther Deschner --- source3/librpc/rpc/dcerpc_helpers.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source3/librpc/rpc/dcerpc_helpers.c') diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c index 8944b395d8..fd51ca253e 100644 --- a/source3/librpc/rpc/dcerpc_helpers.c +++ b/source3/librpc/rpc/dcerpc_helpers.c @@ -267,7 +267,7 @@ NTSTATUS dcerpc_guess_sizes(struct pipe_auth_data *auth, size_t max_len; size_t mod_len; struct gse_context *gse_ctx; - enum dcerpc_AuthType auth_type; + enum spnego_mech auth_type; void *auth_ctx; bool seal = false; NTSTATUS status; @@ -315,11 +315,11 @@ NTSTATUS dcerpc_guess_sizes(struct pipe_auth_data *auth, return status; } switch (auth_type) { - case DCERPC_AUTH_TYPE_NTLMSSP: + case SPNEGO_NTLMSSP: *auth_len = NTLMSSP_SIG_SIZE; break; - case DCERPC_AUTH_TYPE_KRB5: + case SPNEGO_KRB5: gse_ctx = talloc_get_type(auth_ctx, struct gse_context); if (!gse_ctx) { @@ -653,7 +653,7 @@ static NTSTATUS add_spnego_auth_footer(struct spnego_context *spnego_ctx, enum dcerpc_AuthLevel auth_level, DATA_BLOB *rpc_out) { - enum dcerpc_AuthType auth_type; + enum spnego_mech auth_type; struct gse_context *gse_ctx; struct auth_ntlmssp_state *ntlmssp_ctx; void *auth_ctx; @@ -670,7 +670,7 @@ static NTSTATUS add_spnego_auth_footer(struct spnego_context *spnego_ctx, } switch (auth_type) { - case DCERPC_AUTH_TYPE_KRB5: + case SPNEGO_KRB5: gse_ctx = talloc_get_type(auth_ctx, struct gse_context); if (!gse_ctx) { status = NT_STATUS_INTERNAL_ERROR; @@ -680,7 +680,7 @@ static NTSTATUS add_spnego_auth_footer(struct spnego_context *spnego_ctx, auth_level, rpc_out); break; - case DCERPC_AUTH_TYPE_NTLMSSP: + case SPNEGO_NTLMSSP: ntlmssp_ctx = talloc_get_type(auth_ctx, struct auth_ntlmssp_state); if (!ntlmssp_ctx) { @@ -705,7 +705,7 @@ static NTSTATUS get_spnego_auth_footer(TALLOC_CTX *mem_ctx, DATA_BLOB *data, DATA_BLOB *full_pkt, DATA_BLOB *auth_token) { - enum dcerpc_AuthType auth_type; + enum spnego_mech auth_type; struct auth_ntlmssp_state *ntlmssp_ctx; struct gse_context *gse_ctx; void *auth_ctx; @@ -717,7 +717,7 @@ static NTSTATUS get_spnego_auth_footer(TALLOC_CTX *mem_ctx, } switch (auth_type) { - case DCERPC_AUTH_TYPE_KRB5: + case SPNEGO_KRB5: gse_ctx = talloc_get_type(auth_ctx, struct gse_context); if (!gse_ctx) { @@ -730,7 +730,7 @@ static NTSTATUS get_spnego_auth_footer(TALLOC_CTX *mem_ctx, auth_level, data, full_pkt, auth_token); - case DCERPC_AUTH_TYPE_NTLMSSP: + case SPNEGO_NTLMSSP: ntlmssp_ctx = talloc_get_type(auth_ctx, struct auth_ntlmssp_state); if (!ntlmssp_ctx) { -- cgit