diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /auth-shadow.c | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'auth-shadow.c')
-rw-r--r-- | auth-shadow.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |