From: dtucker <dtucker>
Date: Wed, 26 Sep 2007 21:03:20 +0000 (+0000)
Subject:  - (dtucker) [configure.ac defines.h] Shadow expiry does not work on QNX6
X-Git-Tag: V_4_9_P1~146
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/86996ebed18328547f52c8afa277f4dc748db102

 - (dtucker) [configure.ac defines.h] Shadow expiry does not work on QNX6
   so disable it for that platform.  From bacon at cs nyu edu.
---

diff --git a/ChangeLog b/ChangeLog
index 41ed1dbc..14351d37 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
diff --git a/configure.ac b/configure.ac
index f57da71b..f46f2c28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 ead33731..276542df 100644
--- a/defines.h
+++ b/defines.h
@@ -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