summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal/lib/gssapi/krb5/accept_sec_context.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/source4/heimdal/lib/gssapi/krb5/accept_sec_context.c b/source4/heimdal/lib/gssapi/krb5/accept_sec_context.c
index a6f0f31246..8dbd087da6 100644
--- a/source4/heimdal/lib/gssapi/krb5/accept_sec_context.c
+++ b/source4/heimdal/lib/gssapi/krb5/accept_sec_context.c
@@ -520,30 +520,16 @@ gsskrb5_acceptor_start(OM_uint32 * minor_status,
if(ctx->flags & GSS_C_MUTUAL_FLAG) {
krb5_data outbuf;
- int use_subkey = 0;
_gsskrb5i_is_cfx(ctx, &is_cfx);
if (is_cfx != 0
|| (ap_options & AP_OPTS_USE_SUBKEY)) {
- use_subkey = 1;
- } else {
- krb5_keyblock *rkey;
- kret = krb5_auth_con_getremotesubkey(context, ctx->auth_context, &rkey);
- if (kret == 0) {
- kret = krb5_auth_con_setlocalsubkey(context, ctx->auth_context, rkey);
- if (kret == 0) {
- use_subkey = 1;
- }
- krb5_free_keyblock(context, rkey);
- }
- }
- if (use_subkey) {
+ kret = krb5_auth_con_addflags(context,
+ ctx->auth_context,
+ KRB5_AUTH_CONTEXT_USE_SUBKEY,
+ NULL);
ctx->more_flags |= ACCEPTOR_SUBKEY;
- krb5_auth_con_addflags(context,
- ctx->auth_context,
- KRB5_AUTH_CONTEXT_USE_SUBKEY,
- NULL);
}
kret = krb5_mk_rep(context,