From c4125f8ac4ade74f8c8ce4663986bb8256347cef Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 22 Sep 1997 18:38:36 +0000 Subject: [PATCH] Pass keytype to string_to_key git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3535 ec53bebd-3082-4978-b11e-865c3cabbd6b --- admin/util.c | 3 ++- kpasswd/kpasswdd.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/admin/util.c b/admin/util.c index c6db682e5..11cec227b 100644 --- a/admin/util.c +++ b/admin/util.c @@ -62,7 +62,8 @@ set_keys(hdb_entry *ent, char *password) memset(&salt, 0, sizeof(salt)); krb5_get_salt(ent->principal, &salt); for(i = 0; i < ent->keys.len; i++) { - krb5_string_to_key(password, &salt, &ent->keys.val[i].key); /* XXX */ + krb5_string_to_key(password, &salt, ent->keys.val[i].key.keytype, + &ent->keys.val[i].key); /* XXX */ seal_key(&ent->keys.val[i]); } krb5_data_free(&salt); diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c index ac03de16d..28d40170f 100644 --- a/kpasswd/kpasswdd.c +++ b/kpasswd/kpasswdd.c @@ -275,9 +275,10 @@ change (krb5_auth_context auth_context, krb5_data_zero (&salt); krb5_get_salt (principal, &salt); memset (&new_keyblock, 0, sizeof(new_keyblock)); - krb5_string_to_key_data (pwd_data, &salt, &new_keyblock); - krb5_data_free (&salt); old_keyblock = &ent.keys.val[0].key; + krb5_string_to_key_data (pwd_data, &salt, old_keyblock->keytype, /* XXX */ + &new_keyblock); + krb5_data_free (&salt); if (new_keyblock.keytype == old_keyblock->keytype && new_keyblock.keyvalue.length == old_keyblock->keyvalue.length