From: dtucker <dtucker>
Date: Wed, 11 Feb 2004 07:48:52 +0000 (+0000)
Subject:  - (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check
X-Git-Tag: V_3_8_P1~36
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/d78480be9f049f1c78df9c6ed66accb81bec1f94?hp=0655c76360d36dabec2ef6ff109b8a4d565be987

 - (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 a7684c2e..3f4abc10 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
diff --git a/auth-passwd.c b/auth-passwd.c
index e434a21e..28f29cc6 100644
--- 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 a1a9ee2f..4b3a514f 100644
--- 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 */