From e6f48c2db84ad7c16e0def7c0d95c885a9dad52e Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 30 Apr 2010 20:13:52 +0000 Subject: [PATCH] Clean up IAKERB changes to init_sec_context.c in krb5 gss mech: add back a CFX_EXERCISE block which is likely necessary for compilation with that flag, and remove the unused exts parameter to mutual_auth(). git-svn-id: svn://anonsvn.mit.edu/krb5/branches/iakerb@23950 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/krb5/init_sec_context.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c index 484eedfd7b..a7bff2f5d7 100644 --- a/src/lib/gssapi/krb5/init_sec_context.c +++ b/src/lib/gssapi/krb5/init_sec_context.c @@ -270,6 +270,9 @@ struct gss_checksum_data { krb5_gss_ctx_ext_t exts; }; +#ifdef CFX_EXERCISE +#include "../../krb5/krb/auth_con.h" +#endif static krb5_error_code KRB5_CALLCONV make_gss_checksum (krb5_context context, krb5_auth_context auth_context, void *cksum_data, krb5_data **out) @@ -748,8 +751,7 @@ mutual_auth( gss_buffer_t output_token, OM_uint32 *ret_flags, OM_uint32 *time_rec, - krb5_context context, - krb5_gss_ctx_ext_t exts) + krb5_context context) { OM_uint32 major_status; unsigned char *ptr; @@ -1071,7 +1073,7 @@ krb5_gss_init_sec_context_ext( time_req, input_chan_bindings, input_token, actual_mech_type, output_token, ret_flags, time_rec, - context, exts); + context); /* If context_handle is now NO_CONTEXT, mutual_auth called delete_sec_context, which would've zapped the krb5 context too. */ -- 2.47.2