summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
};