From 426a67488875669b60beda4c4d2bccab8f40ca2c Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Tue, 29 Mar 2011 02:26:52 +1100 Subject: [PATCH] don't assert !CTX_FLAG_KRB_REAUTH when exporting partial contexts, we may need this path for local attribute provider reentrancy --- mech_eap/export_sec_context.c | 5 ++--- mech_eap/import_sec_context.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mech_eap/export_sec_context.c b/mech_eap/export_sec_context.c index 7d3842b..b242086 100644 --- a/mech_eap/export_sec_context.c +++ b/mech_eap/export_sec_context.c @@ -146,9 +146,8 @@ gssEapExportSecContext(OM_uint32 *minor, * The partial context is only transmitted for unestablished acceptor * contexts. */ - if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) { - assert((ctx->flags & CTX_FLAG_KRB_REAUTH) == 0); - + if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx) && + (ctx->flags & CTX_FLAG_KRB_REAUTH) == 0) { major = gssEapExportPartialContext(minor, ctx, &partialCtx); if (GSS_ERROR(major)) goto cleanup; diff --git a/mech_eap/import_sec_context.c b/mech_eap/import_sec_context.c index df52410..7f9cd2f 100644 --- a/mech_eap/import_sec_context.c +++ b/mech_eap/import_sec_context.c @@ -296,9 +296,8 @@ gssEapImportContext(OM_uint32 *minor, * The partial context should only be expected for unestablished * acceptor contexts. */ - if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) { - assert((ctx->flags & CTX_FLAG_KRB_REAUTH) == 0); - + if (!CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx) && + (ctx->flags & CTX_FLAG_KRB_REAUTH) == 0) { major = gssEapImportPartialContext(minor, &p, &remain, ctx); if (GSS_ERROR(major)) return major; -- 2.1.4