3 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ddfe3640..d568a57a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20070927
  - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if
    we don't have <poll.h> (eq QNX).  From bacon at cs nyu edu.
+ - (dtucker) [configure.ac defines.h] Shadow expiry does not work on QNX6
+   so disable it for that platform.  From bacon at cs nyu edu.
 
 20070921
  - (djm) [atomicio.c] Fix spin avoidance for platforms that define
@@ -3266,4 +3268,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4759 2007/09/26 21:00:09 dtucker Exp $
+$Id: ChangeLog,v 1.4760 2007/09/26 21:03:20 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 7ef93c7d0..e9402a735 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.385 2007/09/26 21:00:09 dtucker Exp $
+# $Id: configure.ac,v 1.386 2007/09/26 21:03:20 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.385 $)
+AC_REVISION($Revision: 1.386 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -786,6 +786,7 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE(MISSING_FD_MASK, 1, [Define on *nto-qnx systems])
         AC_DEFINE(DISABLE_LASTLOG)
         AC_DEFINE(SSHD_ACQUIRES_CTTY)
+        AC_DEFINE(BROKEN_SHADOW_EXPIRE, 1, [QNX shadow support is broken])
         enable_etc_default_login=no     # has incompatible /etc/default/login
         case "$host" in
         *-*-nto-qnx6*)
diff --git a/defines.h b/defines.h
index 237795339..595908310 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.144 2007/09/17 15:32:33 tim Exp $ */
+/* $Id: defines.h,v 1.145 2007/09/26 21:03:20 dtucker Exp $ */
 
 
 /* Constants */
@@ -540,6 +540,10 @@ struct winsize {
 # undef HAVE_UPDWTMPX
 #endif
 
+#if defined(BROKEN_SHADOW_EXPIRE) && defined(HAS_SHADOW_EXPIRE)
+# undef HAS_SHADOW_EXPIRE
+#endif
+
 #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) && \
     defined(SYSLOG_R_SAFE_IN_SIGHAND)
 # define DO_LOG_SAFE_IN_SIGHAND