diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-11-09 22:26:01 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-11-09 22:26:01 +0000 |
| commit | 40afef224a6852357b017eceebd0c0c75e2d19af (patch) | |
| tree | 632c361b9871dcfdc8a81b725d6de55c91db684a /src/lib/kdb/fetch_mkey.c | |
| parent | f33712e86ca8370634283c90dfb95fe186edc9f4 (diff) | |
| download | krb5-40afef224a6852357b017eceebd0c0c75e2d19af.tar.gz krb5-40afef224a6852357b017eceebd0c0c75e2d19af.tar.xz krb5-40afef224a6852357b017eceebd0c0c75e2d19af.zip | |
* fetch_mkey.c, kdb_cpw.c, t_kdb.c :
Remove krb5_enctype from krb5_string_to_key() args.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7083 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kdb/fetch_mkey.c')
| -rw-r--r-- | src/lib/kdb/fetch_mkey.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c index 1f2c5e227..1197374ef 100644 --- a/src/lib/kdb/fetch_mkey.c +++ b/src/lib/kdb/fetch_mkey.c @@ -73,8 +73,7 @@ krb5_db_fetch_mkey(context, mname, eblock, fromkeyboard, twice, keyfile, salt, k if ((retval = krb5_read_password(context, krb5_mkey_pwd_prompt1, twice ? krb5_mkey_pwd_prompt2 : 0, - password, - &size))) + password, &size))) return(retval); pwd.data = password; @@ -84,7 +83,7 @@ krb5_db_fetch_mkey(context, mname, eblock, fromkeyboard, twice, keyfile, salt, k if (retval) return retval; } - retval = krb5_string_to_key(context, eblock, key->enctype, key, &pwd, + retval = krb5_string_to_key(context, eblock, key, &pwd, salt ? salt : &scratch); if (!salt) krb5_xfree(scratch.data); |