aboutsummaryrefslogtreecommitdiff
path: root/src/lib/kadm5/srv
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2010-01-07 20:57:02 +0000
committerGreg Hudson <ghudson@mit.edu>2010-01-07 20:57:02 +0000
commit9f4eacfe818bff7e0d8c2c14f713aa28f06420e4 (patch)
tree286efd4d1a3bd2d6bb5a949aeed458a066b72bbf /src/lib/kadm5/srv
parentcb989e3a3ac69596235d4acc746143a2b6673c67 (diff)
downloadkrb5-9f4eacfe818bff7e0d8c2c14f713aa28f06420e4.zip
krb5-9f4eacfe818bff7e0d8c2c14f713aa28f06420e4.tar.gz
krb5-9f4eacfe818bff7e0d8c2c14f713aa28f06420e4.tar.bz2
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: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23607 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kadm5/srv')
-rw-r--r--src/lib/kadm5/srv/server_kdb.c4
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;