- (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 a7684c2eb6e587fbba18731dd3330dd3ed3f332a..3f4abc10162de3a621b223a911e81c9a25f29741 100644 (file)
--- 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

diff --git a/auth-passwd.c b/auth-passwd.c
index e434a21e3812682745e78b3436736d3c8faf6fe3..28f29cc6599a9e864b7c42eb7b415250aed88356 100644 (file)
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -97,7 +97,7 @@ auth_password(Authctxt *authctxt, const char *password)
                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 a1a9ee2f063fb3d1c10334276cf6146fe9a829d5..4b3a514f52d638234489efda2bd718d2f788fa7d 100644 (file)
--- a/auth-shadow.c
+++ b/auth-shadow.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 RCSID("$Id$");
 
-#ifdef USE_SHADOW
+#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
 #include <shadow.h>
 
 #include "auth.h"
@@ -76,4 +76,4 @@ auth_shadow_pwexpired(Authctxt *ctxt)
 
        return 0;
 }
-#endif /* USE_SHADOW */
+#endif /* USE_SHADOW && HAS_SHADOW_EXPIRE */