From f3d5578b9448de08f678debcad6ae8110d8c20c4 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Tue, 12 Aug 2008 16:11:16 -0400 Subject: Comment out code that generates keys with a random salt, apparently this does not work as expected and generates faulty keys --- ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c index b20340df1..60b40212b 100644 --- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c +++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c @@ -576,6 +576,7 @@ static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg, * we have to use a more conservative approach and set the salt * to be REALMprincipal (the concatenation of REALM and principal * name without any separator) */ +#if 0 if (krbTicketFlags & KTF_REQUIRES_PRE_AUTH) { salt.length = KRB5P_SALT_SIZE; salt.data = malloc(KRB5P_SALT_SIZE); @@ -592,6 +593,7 @@ static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg, goto enc_error; } } else { +#endif krberr = krb5_principal2salt(krbctx, princ, &salt); if (krberr) { slapi_log_error(SLAPI_LOG_FATAL, "ipa_pwd_extop", @@ -599,7 +601,9 @@ static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg, krb5_get_error_message(krbctx, krberr)); goto enc_error; } +#if 0 } +#endif break; case KRB5_KDB_SALTTYPE_V4: -- cgit