summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2013-04-22 11:18:40 +0200
committerJakub Hrozek <jhrozek@redhat.com>2013-05-02 12:49:47 +0200
commit4ada3948dd888e7d95831a377bff3f8608cd778b (patch)
tree4e02ef8f160cd5354f39c2a1809a15c2ac2c906b
parentb49d753b5a17c4092d8c24e84eea4400de39d341 (diff)
downloadsssd-4ada3948dd888e7d95831a377bff3f8608cd778b.tar.gz
sssd-4ada3948dd888e7d95831a377bff3f8608cd778b.tar.bz2
sssd-4ada3948dd888e7d95831a377bff3f8608cd778b.zip
Display the last grace warning, too
Due to a comparison error, the last warning when an LDAP password was in its grace period was never displayed. https://fedorahosted.org/sssd/ticket/1890
-rw-r--r--src/providers/ldap/ldap_auth.c4
-rw-r--r--src/providers/ldap/sdap_async_connection.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c
index f4e6d28f..58cc2d35 100644
--- a/src/providers/ldap/ldap_auth.c
+++ b/src/providers/ldap/ldap_auth.c
@@ -200,7 +200,7 @@ static errno_t check_pwexpire_ldap(struct pam_data *pd,
{
int ret = EOK;
- if (ppolicy->grace > 0 || ppolicy->expire > 0) {
+ if (ppolicy->grace >= 0 || ppolicy->expire > 0) {
uint32_t *data;
uint32_t *ptr;
@@ -215,7 +215,7 @@ static errno_t check_pwexpire_ldap(struct pam_data *pd,
}
ptr = data;
- if (ppolicy->grace > 0) {
+ if (ppolicy->grace >= 0) {
*ptr = SSS_PAM_USER_INFO_GRACE_LOGIN;
ptr++;
*ptr = ppolicy->grace;
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
index f77d0380..304a7be5 100644
--- a/src/providers/ldap/sdap_async_connection.c
+++ b/src/providers/ldap/sdap_async_connection.c
@@ -615,7 +615,7 @@ static void simple_bind_done(struct sdap_op *op,
("Password was reset. "
"User must set a new password.\n"));
ret = ERR_PASSWORD_EXPIRED;
- } else if (pp_grace > 0) {
+ } else if (pp_grace >= 0) {
DEBUG(SSSDBG_TRACE_LIBS,
("Password expired. "
"[%d] grace logins remaining.\n",