From 55a553c56dc055bd7d96cdc8ad79805e7ff757fb Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Mon, 27 Apr 2020 15:10:29 +1000 Subject: [PATCH] gss: don't use mechglue private header in SPNEGO Unbreak last commit, including mech_locl.h in SPNEGO appears to break Windows builds --- lib/gssapi/spnego/negoex_ctx.c | 6 ++++-- lib/gssapi/spnego/spnego_locl.h | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/gssapi/spnego/negoex_ctx.c b/lib/gssapi/spnego/negoex_ctx.c index 73ace4d80..8157d405e 100644 --- a/lib/gssapi/spnego/negoex_ctx.c +++ b/lib/gssapi/spnego/negoex_ctx.c @@ -783,7 +783,8 @@ _gss_negoex_init(OM_uint32 *minor, size_t nmessages = 0; int send_alert = FALSE, mech_error = FALSE; - _mg_buffer_zero(output_token); + output_token->length = 0; + output_token->value = NULL; if (ctx->negoex_step == 0 && input_token != GSS_C_NO_BUFFER && input_token->length != 0) @@ -903,7 +904,8 @@ _gss_negoex_accept(OM_uint32 *minor, size_t nmessages; int send_alert = FALSE, mech_error = FALSE; - _mg_buffer_zero(output_token); + output_token->length = 0; + output_token->value = NULL; if (deleg_cred) *deleg_cred = GSS_C_NO_CREDENTIAL; diff --git a/lib/gssapi/spnego/spnego_locl.h b/lib/gssapi/spnego/spnego_locl.h index 6c0ddc956..9b0e3310f 100644 --- a/lib/gssapi/spnego/spnego_locl.h +++ b/lib/gssapi/spnego/spnego_locl.h @@ -68,7 +68,6 @@ #include #include -#include #include "spnego_asn1.h" #include "negoex_locl.h"