From 373db284e905a4ce52b396c939ac13db61ac5c7f Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 14 Jan 2010 18:51:09 +0000 Subject: [PATCH] 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. ticket: 6546 status: resolved version_fixed: 1.8 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23658 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kadm5/srv/server_kdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c index 4b1d05dbb..1e98a8e03 100644 --- a/src/lib/kadm5/srv/server_kdb.c +++ b/src/lib/kadm5/srv/server_kdb.c @@ -205,8 +205,8 @@ krb5_error_code kdb_init_hist(kadm5_server_handle_t handle, char *r) } - 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; -- 2.26.2