Index: pam_winbind.c
===================================================================
RCS file: /cvsroot/upstream/samba3/source/nsswitch/pam_winbind.c,v
retrieving revision 1.1.1.5
diff -u -r1.1.1.5 pam_winbind.c
--- pam_winbind.c	15 Nov 2006 05:29:21 -0000	1.1.1.5
+++ pam_winbind.c	8 Dec 2006 14:53:49 -0000
@@ -472,7 +472,8 @@
 	    (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);
 		}