commit 709b20016425f337eda1b79627a8e4d5e9470f13 Author: tlyu tlyu@dc483132-0cff-0310-8789-dd5450dbe970 Date: Thu Jan 14 18:51:09 2010 +0000

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.

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 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c index 4b1d05d..1e98a8e 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;