summaryrefslogtreecommitdiff
path: root/nsswitch
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-06-19 01:52:11 +0200
committerKarolin Seeger <kseeger@samba.org>2009-06-19 08:47:43 +0200
commit3c6d8df7f6cb7cbc806218fc24f9dee069c63d18 (patch)
treec53a7ebefc42baeedd6def9a5314c8a565a20592 /nsswitch
parent09393cc0c3deaeda8eb86827ebec9171cffdc5a2 (diff)
downloadsamba-3c6d8df7f6cb7cbc806218fc24f9dee069c63d18.tar.gz
s3-pam_winbind: Fix Bug 6253: Use correct value for password expiry calculation.
Based on patch from Blindauer Emmanuel <samba@mooby.net>. Guenther (cherry picked from commit e77355fec0f3b30cadcefc106c4f7957bf763c6b)
Diffstat (limited to 'nsswitch')
-rw-r--r--nsswitch/pam_winbind.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 545c87d0c4b..e90f1b75ad6 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -914,7 +914,8 @@ static void _pam_warn_password_expiry(struct pwb_context *ctx,
/* now check for the global password policy */
/* good catch from Ralf Haferkamp: an expiry of "never" is translated
* to -1 */
- if (policy->expire == -1) {
+ if ((policy->expire == (int64_t)-1) ||
+ (policy->expire == 0)) {
return;
}