- (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check
if HAS_SHADOW_EXPIRY is set.
diff --git a/ChangeLog b/ChangeLog
index bdba48a..a520f68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040211
+ - (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check
+ if HAS_SHADOW_EXPIRY is set.
+
20040210
- (dtucker) [auth-passwd.c auth.h openbsd-compat/port-aix.c
openbsd-compat/port-aix.h] Bug #14: Use do_pwchange to support AIX's
@@ -16,7 +20,7 @@
- (dtucker) [configure.ac loginrec.c] Bug #464: Use updwtmpx on platforms
that support it. from & ok mouring@
- (dtucker) [configure.ac] Bug #345: Do not disable utmp on HP-UX 10.x.
- ok djm@
+ ok djm@
20040207
- (dtucker) OpenBSD CVS Sync
@@ -1840,4 +1844,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3224 2004/02/10 06:15:05 dtucker Exp $
+$Id: ChangeLog,v 1.3225 2004/02/11 07:48:52 dtucker Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index e434a21..28f29cc 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -97,7 +97,7 @@
return ok;
}
#endif
-#ifdef USE_SHADOW
+#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
if (auth_shadow_pwexpired(authctxt)) {
disable_forwarding();
authctxt->force_pwchange = 1;
diff --git a/auth-shadow.c b/auth-shadow.c
index 8436eee..76c0d9f 100644
--- a/auth-shadow.c
+++ b/auth-shadow.c
@@ -23,9 +23,9 @@
*/
#include "includes.h"
-RCSID("$Id: auth-shadow.c,v 1.2 2004/02/10 02:51:34 dtucker Exp $");
+RCSID("$Id: auth-shadow.c,v 1.3 2004/02/11 07:48:52 dtucker Exp $");
-#ifdef USE_SHADOW
+#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
#include <shadow.h>
#include "auth.h"
@@ -76,4 +76,4 @@
return 0;
}
-#endif /* USE_SHADOW */
+#endif /* USE_SHADOW && HAS_SHADOW_EXPIRE */