summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>2003-06-16 22:34:50 +0000
committerSam Hartman <hartmans@mit.edu>2003-06-16 22:34:50 +0000
commit9ef7a4e61a4cb310c52b1144a43c3a5983509f11 (patch)
treee48126e90008c2eddd48e286dc25e2eaf635d79c
parentd504b9157f95f67a4ed4c4bc18104d1acf0ba351 (diff)
downloadkrb5-9ef7a4e61a4cb310c52b1144a43c3a5983509f11.tar.gz
krb5-9ef7a4e61a4cb310c52b1144a43c3a5983509f11.tar.xz
krb5-9ef7a4e61a4cb310c52b1144a43c3a5983509f11.zip
Set use_conf_ktypes to 1 while looking up the tgt to use for
forwarding. Ticket: 1610 Tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15627 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/krb5/krb/ChangeLog4
-rw-r--r--src/lib/krb5/krb/fwd_tgt.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index b7aab3c0d2..b5288e71c8 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-16 Sam Hartman <hartmans@mit.edu>
+
+ * fwd_tgt.c (krb5_fwd_tgt_creds): Set use_conf_ktypes to true while getting the TGT key
+
2003-06-13 Tom Yu <tlyu@mit.edu>
* rd_rep.c (krb5_rd_rep): Free subkeys before replacing them, if
diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c
index 844536bbd6..4e2c8f04b8 100644
--- a/src/lib/krb5/krb/fwd_tgt.c
+++ b/src/lib/krb5/krb/fwd_tgt.c
@@ -56,6 +56,7 @@ krb5_fwd_tgt_creds(krb5_context context, krb5_auth_context auth_context, char *r
int free_rhost = 0;
krb5_enctype enctype = 0;
krb5_keyblock *session_key;
+ krb5_boolean old_use_conf_ktypes = context->use_conf_ktypes;
memset((char *)&creds, 0, sizeof(creds));
memset((char *)&tgt, 0, sizeof(creds));
@@ -109,8 +110,10 @@ krb5_fwd_tgt_creds(krb5_context context, krb5_auth_context auth_context, char *r
goto errout;
/* fetch tgt directly from cache */
+ context->use_conf_ktypes = 1;
retval = krb5_cc_retrieve_cred (context, cc, KRB5_TC_SUPPORTED_KTYPES,
&creds, &tgt);
+ context->use_conf_ktypes = old_use_conf_ktypes;
if (retval)
goto errout;