From 2a5a96d60ec464e831274fda3e3b6653de96196f Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Sat, 27 Jul 2013 17:29:54 -0500 Subject: [PATCH] When asking for the strongest key, get it right (cherry picked from commit 1826106ff4befe3e7dffc18692e40bd244c0d8d8) --- kdc/kerberos5.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c index 7d16347e4..303736cb5 100644 --- a/kdc/kerberos5.c +++ b/kdc/kerberos5.c @@ -133,7 +133,7 @@ _kdc_find_etype(krb5_context context, krb5_boolean use_strongest_session_key, krb5_enctype enctype = ETYPE_NULL; krb5_enctype clientbest = (krb5_enctype)ETYPE_NULL; const krb5_enctype *p; - Key *key; + Key *key = NULL; int i, k; int client_offered_1des = 0; @@ -175,6 +175,8 @@ _kdc_find_etype(krb5_context context, krb5_boolean use_strongest_session_key, continue; if (clientbest == (krb5_enctype)ETYPE_NULL) clientbest = p[i]; + if (key) + continue; /* already picked a key below */ /* check target princ support */ ret = hdb_enctype2key(context, &princ->entry, p[i], &key); if (ret) -- 2.11.4.GIT