diff options
| -rw-r--r-- | src/admin/edit/kdb5_edit.c | 5 | ||||
| -rw-r--r-- | src/kadmin/server/adm_funcs.c | 5 | ||||
| -rw-r--r-- | src/kdc/do_as_req.c | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c index 8d6aa50eac..21227ff773 100644 --- a/src/admin/edit/kdb5_edit.c +++ b/src/admin/edit/kdb5_edit.c @@ -45,8 +45,6 @@ static char rcsid_kdb_edit_c[] = #include "./kdb5_edit.h" -#define norealm_salt(princ, retdata) krb5_principal2salt(&(princ)[1], retdata) - struct mblock mblock = { /* XXX */ KRB5_KDB_MAX_LIFE, KRB5_KDB_MAX_RLIFE, @@ -1282,7 +1280,8 @@ OLDDECLARG(int, salttype) salt.saltdata.length = 0; 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(cmdname, retval, "while converting principal to salt for '%s'", newprinc); return; diff --git a/src/kadmin/server/adm_funcs.c b/src/kadmin/server/adm_funcs.c index 9c1c5fce4b..508c209531 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); diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c index 44289e4445..991518932a 100644 --- a/src/kdc/do_as_req.c +++ b/src/kdc/do_as_req.c @@ -448,7 +448,8 @@ ticket_reply.enc_part2 = &enc_tkt_reply; padat_tmp[0]->length = 0; break; case KRB5_KDB_SALTTYPE_NOREALM: - if (retval = norealm_salt(request->client, &data_bar)) { + if (retval = krb5_principal2salt_norealm(request->client, + &data_bar)) { cleanup(); return retval; } |