always check for error token in case of a failure

This commit is contained in:
Love Hornquist Astrand
2010-11-08 13:40:01 -08:00
parent 526aeef0c7
commit 2e31740f62

View File

@@ -772,7 +772,7 @@ repl_mutual
ctx->auth_context, ctx->auth_context,
&indata, &indata,
&repl); &repl);
if (kret >= ASN1_BAD_TIMEFORMAT && kret <= ASN1_INDEF_EXTRA_DATA) { if (kret) {
ret = _gsskrb5_decapsulate(minor_status, ret = _gsskrb5_decapsulate(minor_status,
input_token, input_token,
&indata, &indata,
@@ -780,10 +780,9 @@ repl_mutual
GSS_KRB5_MECHANISM); GSS_KRB5_MECHANISM);
if (ret == GSS_S_COMPLETE) { if (ret == GSS_S_COMPLETE) {
*minor_status = handle_error_packet(context, ctx, indata); *minor_status = handle_error_packet(context, ctx, indata);
return GSS_S_FAILURE; } else {
}
} else if (kret) {
*minor_status = kret; *minor_status = kret;
}
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
} else { } else {