diff options
author | Simo Sorce <ssorce@redhat.com> | 2011-06-20 09:23:37 -0400 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2011-08-26 08:24:49 -0400 |
commit | b4aab3d98d68bfa79323b216320b1d3dcc1941c9 (patch) | |
tree | c70d1cd61befcc8ea15df869abc86f7d5c7ea99b /daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c | |
parent | 672035cbbac649b74cbe2d8396466d18e3e81130 (diff) | |
download | freeipa-b4aab3d98d68bfa79323b216320b1d3dcc1941c9.tar.gz freeipa-b4aab3d98d68bfa79323b216320b1d3dcc1941c9.tar.xz freeipa-b4aab3d98d68bfa79323b216320b1d3dcc1941c9.zip |
ipa-pwd-extop: Use common krb5 structs from kdb.h
This removes custom structures and allows easier sharing of code with ipa-kdb
Diffstat (limited to 'daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c')
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c index 6be02f9f..3ce39609 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c @@ -319,7 +319,7 @@ static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg, salt.data = NULL; - switch (krbcfg->pref_encsalts[i].salt_type) { + switch (krbcfg->pref_encsalts[i].ks_salttype) { case KRB5_KDB_SALTTYPE_ONLYREALM: @@ -396,14 +396,14 @@ static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg, default: LOG_FATAL("Invalid salt type [%d]\n", - krbcfg->pref_encsalts[i].salt_type); + krbcfg->pref_encsalts[i].ks_salttype); goto enc_error; } /* need to build the key now to manage the AFS salt.length * special case */ krberr = krb5_c_string_to_key(krbctx, - krbcfg->pref_encsalts[i].enc_type, + krbcfg->pref_encsalts[i].ks_enctype, &pwd, &salt, &key); if (krberr) { LOG_FATAL("krb5_c_string_to_key failed [%s]\n", @@ -461,7 +461,7 @@ static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg, goto enc_error; } - kset->keys[i].salt->type = krbcfg->pref_encsalts[i].salt_type; + kset->keys[i].salt->type = krbcfg->pref_encsalts[i].ks_salttype; if (salt.length) { kset->keys[i].salt->value.bv_len = salt.length; |