diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-shadow.c | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -3,6 +3,8 @@ | |||
3 | ok dtucker@ | 3 | ok dtucker@ |
4 | - (dtucker) [ssh-rand-helper.c] Provide seed_rng since it may be called | 4 | - (dtucker) [ssh-rand-helper.c] Provide seed_rng since it may be called |
5 | via mkstemp in some configurations. ok djm@ | 5 | via mkstemp in some configurations. ok djm@ |
6 | - (dtucker) [auth-shadow.c] Prevent compiler warnings if "DAY" is defined | ||
7 | by the system headers. | ||
6 | 8 | ||
7 | 20050215 | 9 | 20050215 |
8 | - (dtucker) [config.sh.in] Collect oslevel -r too. | 10 | - (dtucker) [config.sh.in] Collect oslevel -r too. |
@@ -2137,4 +2139,4 @@ | |||
2137 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2139 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2138 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2140 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2139 | 2141 | ||
2140 | $Id: ChangeLog,v 1.3655 2005/02/16 02:20:07 dtucker Exp $ | 2142 | $Id: ChangeLog,v 1.3656 2005/02/16 03:20:06 dtucker Exp $ |
diff --git a/auth-shadow.c b/auth-shadow.c index a85442d72..f6004f68f 100644 --- a/auth-shadow.c +++ b/auth-shadow.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$Id: auth-shadow.c,v 1.5 2004/02/21 23:22:05 dtucker Exp $"); | 26 | RCSID("$Id: auth-shadow.c,v 1.6 2005/02/16 03:20:06 dtucker Exp $"); |
27 | 27 | ||
28 | #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) | 28 | #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) |
29 | #include <shadow.h> | 29 | #include <shadow.h> |
@@ -32,6 +32,9 @@ RCSID("$Id: auth-shadow.c,v 1.5 2004/02/21 23:22:05 dtucker Exp $"); | |||
32 | #include "buffer.h" | 32 | #include "buffer.h" |
33 | #include "log.h" | 33 | #include "log.h" |
34 | 34 | ||
35 | #ifdef DAY | ||
36 | # undef DAY | ||
37 | #endif | ||
35 | #define DAY (24L * 60 * 60) /* 1 day in seconds */ | 38 | #define DAY (24L * 60 * 60) /* 1 day in seconds */ |
36 | 39 | ||
37 | extern Buffer loginmsg; | 40 | extern Buffer loginmsg; |