From cdddef90f93b4f1b5904304ed1a1642cd4fecbed Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Wed, 5 Jan 2005 02:32:05 +0000 Subject: [PATCH] allow client to indicate that subkey should be used git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14445 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/accept_sec_context.c | 3 ++- lib/gssapi/krb5/accept_sec_context.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/gssapi/accept_sec_context.c b/lib/gssapi/accept_sec_context.c index 573a4c7fa..7723d9295 100644 --- a/lib/gssapi/accept_sec_context.c +++ b/lib/gssapi/accept_sec_context.c @@ -448,7 +448,8 @@ gsskrb5_accept_sec_context if(flags & GSS_C_MUTUAL_FLAG) { krb5_data outbuf; - if (is_cfx) { + if (is_cfx != 0 + || (ap_options & AP_OPTS_USE_SUBKEY)) { kret = krb5_auth_con_addflags(gssapi_krb5_context, (*context_handle)->auth_context, KRB5_AUTH_CONTEXT_USE_SUBKEY, diff --git a/lib/gssapi/krb5/accept_sec_context.c b/lib/gssapi/krb5/accept_sec_context.c index 573a4c7fa..7723d9295 100644 --- a/lib/gssapi/krb5/accept_sec_context.c +++ b/lib/gssapi/krb5/accept_sec_context.c @@ -448,7 +448,8 @@ gsskrb5_accept_sec_context if(flags & GSS_C_MUTUAL_FLAG) { krb5_data outbuf; - if (is_cfx) { + if (is_cfx != 0 + || (ap_options & AP_OPTS_USE_SUBKEY)) { kret = krb5_auth_con_addflags(gssapi_krb5_context, (*context_handle)->auth_context, KRB5_AUTH_CONTEXT_USE_SUBKEY,