oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

gss: don't use mechglue private header in SPNEGO

Browse Source 
Unbreak last commit, including mech_locl.h in SPNEGO appears to break Windows
builds
This commit is contained in:
Luke Howard
2020-04-27 15:10:29 +10:00
parent 7cdc9934b1
commit 55a553c56d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/gssapi/spnego/negoex_ctx.c
View File

@@ -783,7 +783,8 @@ _gss_negoex_init(OM_uint32 *minor,
size_t nmessages = 0; size_t nmessages = 0;
int send_alert = FALSE, mech_error = FALSE; 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 && if (ctx->negoex_step == 0 && input_token != GSS_C_NO_BUFFER &&
input_token->length != 0) input_token->length != 0)
@@ -903,7 +904,8 @@ _gss_negoex_accept(OM_uint32 *minor,
size_t nmessages; size_t nmessages;
int send_alert = FALSE, mech_error = FALSE; int send_alert = FALSE, mech_error = FALSE;
_mg_buffer_zero(output_token); output_token->length = 0;
output_token->value = NULL;
if (deleg_cred) if (deleg_cred)
*deleg_cred = GSS_C_NO_CREDENTIAL; *deleg_cred = GSS_C_NO_CREDENTIAL;

1
lib/gssapi/spnego/spnego_locl.h
View File

@@ -68,7 +68,6 @@
#include <asn1_err.h> #include <asn1_err.h>
#include <gssapi_mech.h> #include <gssapi_mech.h>
#include <mech_locl.h>
#include "spnego_asn1.h" #include "spnego_asn1.h"
#include "negoex_locl.h" #include "negoex_locl.h"