r20136: Fix #4290. Properly compute time to password expiration in message from

pam_winbind.  Thanks to Andrew Benham <andrew.benham@thus.net>
(This used to be commit 0d03f5137936546253a8b3334995f536f3621d57)

diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index a61dceedce18972fdca8399807ca21285828d54c..24e27cb8c69e00fc43bbc8aa35e92c30daf8a3f0 100644 (file)
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -536,7 +536,8 @@ static int winbind_auth_request(pam_handle_t * pamh,
            (response.data.auth.policy.expire) && 
            (response.data.auth.info3.pass_last_set_time + response.data.auth.policy.expire > time(NULL) ) ) {
 
-               int days = response.data.auth.policy.expire / SECONDS_PER_DAY;
+               int days = (response.data.auth.info3.pass_last_set_time + response.data.auth.policy.expire -
+                           time(NULL))/ SECONDS_PER_DAY;
                if (days <= DAYS_TO_WARN_BEFORE_PWD_EXPIRES) {
                        _make_remark_format(pamh, PAM_TEXT_INFO, "Your password will expire in %d days", days);
                }