svn rev #23658: branches/krb5-1-8/src/lib/kadm5/srv/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23658
Commit By: tlyu
Log Message:
ticket: 6546
status: resolved
version_fixed: 1.8

pull up r23607 from trunk

 ------------------------------------------------------------------------
 r23607 | ghudson | 2010-01-07 15:57:02 -0500 (Thu, 07 Jan 2010) | 7 lines

 ticket: 6546
 status: open

 When retrieving the kadmin/history key, accept any enctype, as the
 current master key enctype may not match the one the KDB was created
 with.


Changed Files:
U   branches/krb5-1-8/src/lib/kadm5/srv/server_kdb.c
Modified: branches/krb5-1-8/src/lib/kadm5/srv/server_kdb.c
===================================================================
--- branches/krb5-1-8/src/lib/kadm5/srv/server_kdb.c	2010-01-14 16:09:24 UTC (rev 23657)
+++ branches/krb5-1-8/src/lib/kadm5/srv/server_kdb.c	2010-01-14 18:51:09 UTC (rev 23658)
@@ -205,8 +205,8 @@
 
     }
 
-    ret = krb5_dbe_find_enctype(handle->context, &hist_db,
-                                handle->params.enctype, -1, -1, &key_data);
+    ret = krb5_dbe_find_enctype(handle->context, &hist_db, -1, -1, -1,
+                                &key_data);
     if (ret)
         goto done;