diff options
| author | Theodore Tso <tytso@mit.edu> | 1994-03-11 23:06:26 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1994-03-11 23:06:26 +0000 |
| commit | 23e78725abe3132decbd004eeca4316eef51188d (patch) | |
| tree | f628caa02c9ce72d510f1fd0443a287b721eb13e /src/kadmin | |
| parent | 1f86f138999bacaade2579f15954c153957adbfb (diff) | |
| download | krb5-23e78725abe3132decbd004eeca4316eef51188d.tar.gz krb5-23e78725abe3132decbd004eeca4316eef51188d.tar.xz krb5-23e78725abe3132decbd004eeca4316eef51188d.zip | |
Fixed krb5-bugs [0437]:
The norealm_salt macro, which is defined in
src/kdc/kdc_util.h, src/admin/edit/kdb5_edit.c, and
Fixed krb5-bugs [0437]:
The norealm_salt macro, which is defined in
src/kdc/kdc_util.h, src/admin/edit/kdb5_edit.c, and
src/kadmin/server/adm_funcs.c, is wrong and needs to be fixed. It
will cause a coredump if it's ever actually invoked.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3451 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/server/adm_funcs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/kadmin/server/adm_funcs.c b/src/kadmin/server/adm_funcs.c index 9c1c5fce4..508c20953 100644 --- a/src/kadmin/server/adm_funcs.c +++ b/src/kadmin/server/adm_funcs.c @@ -65,8 +65,6 @@ struct saltblock { extern krb5_encrypt_block master_encblock; extern krb5_keyblock master_keyblock; -#define norealm_salt(princ, retdata) krb5_principal2salt(&(princ)[1], retdata) - struct mblock { krb5_deltat max_life; krb5_deltat max_rlife; @@ -348,7 +346,8 @@ OLDDECLARG(krb5_db_entry *, entry) break; case KRB5_KDB_SALTTYPE_NOREALM: - if (retval = norealm_salt(string_princ, &salt.saltdata)) { + if (retval = krb5_principal2salt_norealm(string_princ, + &salt.saltdata)) { com_err("adm_enter_pwd_key", retval, "while converting principal to salt for '%s'", newprinc); return(KRB_ERR_GENERIC); |