diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-passwd.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -22,6 +22,9 @@ | |||
22 | - dtucker@cvs.openbsd.org 2005/01/24 10:29:06 | 22 | - dtucker@cvs.openbsd.org 2005/01/24 10:29:06 |
23 | [moduli] | 23 | [moduli] |
24 | Import new moduli; requested by deraadt@ a week ago | 24 | Import new moduli; requested by deraadt@ a week ago |
25 | - dtucker@cvs.openbsd.org 2005/01/24 11:47:13 | ||
26 | [auth-passwd.c] | ||
27 | #if -> #ifdef so builds without HAVE_LOGIN_CAP work too; ok djm@ otto@ | ||
25 | 28 | ||
26 | 20050120 | 29 | 20050120 |
27 | - (dtucker) OpenBSD CVS Sync | 30 | - (dtucker) OpenBSD CVS Sync |
@@ -2040,4 +2043,4 @@ | |||
2040 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2043 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2041 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2044 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2042 | 2045 | ||
2043 | $Id: ChangeLog,v 1.3625 2005/01/24 11:00:40 dtucker Exp $ | 2046 | $Id: ChangeLog,v 1.3626 2005/01/24 11:50:47 dtucker Exp $ |
diff --git a/auth-passwd.c b/auth-passwd.c index 2e5fbc73a..fb14f5ce4 100644 --- a/auth-passwd.c +++ b/auth-passwd.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: auth-passwd.c,v 1.32 2005/01/21 08:32:02 otto Exp $"); | 39 | RCSID("$OpenBSD: auth-passwd.c,v 1.33 2005/01/24 11:47:13 dtucker Exp $"); |
40 | 40 | ||
41 | #include "packet.h" | 41 | #include "packet.h" |
42 | #include "buffer.h" | 42 | #include "buffer.h" |
@@ -131,7 +131,7 @@ warn_expiry(Authctxt *authctxt, auth_session_t *as) | |||
131 | 131 | ||
132 | pwtimeleft = auth_check_change(as); | 132 | pwtimeleft = auth_check_change(as); |
133 | actimeleft = auth_check_expire(as); | 133 | actimeleft = auth_check_expire(as); |
134 | #if HAVE_LOGIN_CAP | 134 | #ifdef HAVE_LOGIN_CAP |
135 | if (authctxt->valid) { | 135 | if (authctxt->valid) { |
136 | pwwarntime = login_getcaptime(lc, "password-warn", TWO_WEEKS, | 136 | pwwarntime = login_getcaptime(lc, "password-warn", TWO_WEEKS, |
137 | TWO_WEEKS); | 137 | TWO_WEEKS); |