From: Tom Yu <tlyu@mit.edu>
Date: Thu, 25 Oct 2001 20:22:14 +0000 (+0000)
Subject: 	* svr_principal.c (kadm5_decrypt_key): For now, coerce enctype of
X-Git-Tag: krb5-1.3-alpha1~1003
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9ad872adbb2e7accf64964b03da2297d769d804;p=krb5.git

	* svr_principal.c (kadm5_decrypt_key): For now, coerce enctype of
	output keyblock in case we got a match on a similar enctype.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13856 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index df297ffdf..d9a7ee7d9 100644
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-22  Tom Yu  <tlyu@mit.edu>
+
+	* svr_principal.c (kadm5_decrypt_key): For now, coerce enctype of
+	output keyblock in case we got a match on a similar enctype.
+
 2001-10-16  Mitchell Berger  <mitchb@mit.edu>
 	    Matt Crawford  <crawdad@fnal.gov>
 
diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index 933d3c1f7..1586bc5b4 100644
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -1767,6 +1767,13 @@ kadm5_ret_t kadm5_decrypt_key(void *server_handle,
 					   keyblock, keysalt)))
 	 return ret;
 
+    /*
+     * Coerce the enctype of the output keyblock in case we got an
+     * inexact match on the enctype; this behavior will go away when
+     * the key storage architecture gets redesigned for 1.3.
+     */
+    keyblock->enctype = ktype;
+
     if (kvnop)
 	 *kvnop = key_data->key_data_kvno;