summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2011-09-19 15:53:17 -0400
committerSimo Sorce <ssorce@redhat.com>2011-10-06 12:15:05 -0400
commitf28ab8351f8972b5b5354dd98ba6508eab06dc31 (patch)
tree3aae9000a5110ad660f898921846a51a86561c90
parent95b85f907b96bde5907e8190fac262ff869b2b03 (diff)
downloadfreeipa-f28ab8351f8972b5b5354dd98ba6508eab06dc31.tar.gz
freeipa-f28ab8351f8972b5b5354dd98ba6508eab06dc31.tar.xz
freeipa-f28ab8351f8972b5b5354dd98ba6508eab06dc31.zip
ipa-kdb: Fix legacy password hashes generation
We were not searching for objectclass so the test to se if a user had the posixAccount attribute was failing and the user was not marked as ipa_user. This in turn caused us to not synchronize legacy hashes by not trying to store the userPassword attribute. Fixes: https://fedorahosted.org/freeipa/ticket/1820
-rw-r--r--daemons/ipa-kdb/ipa_kdb_passwords.c4
-rw-r--r--daemons/ipa-kdb/ipa_kdb_principals.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/daemons/ipa-kdb/ipa_kdb_passwords.c b/daemons/ipa-kdb/ipa_kdb_passwords.c
index 28ec382d9..93e9e2060 100644
--- a/daemons/ipa-kdb/ipa_kdb_passwords.c
+++ b/daemons/ipa-kdb/ipa_kdb_passwords.c
@@ -283,9 +283,7 @@ krb5_error_code ipadb_get_pwd_expiration(krb5_context context,
krb5_principal mod_princ = NULL;
krb5_boolean truexp = true;
-
- /* Assume all principals with just one component as user principals */
- if (entry->princ->length == 1) {
+ if (ied->ipa_user) {
kerr = krb5_dbe_lookup_mod_princ_data(context, entry,
&mod_time, &mod_princ);
if (kerr) {
diff --git a/daemons/ipa-kdb/ipa_kdb_principals.c b/daemons/ipa-kdb/ipa_kdb_principals.c
index 249aed2f6..fdd834f35 100644
--- a/daemons/ipa-kdb/ipa_kdb_principals.c
+++ b/daemons/ipa-kdb/ipa_kdb_principals.c
@@ -53,6 +53,7 @@ static char *std_principal_attrs[] = {
"nsaccountlock",
"passwordHistory",
+ "objectClass",
NULL
};