- (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 41ed1dbcd4915154ee0e13d2e2acd93387ddf89a..14351d37e62ad1972ade1e5c2d1197986eec69ce 100644 (file)
--- 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 f57da71baed330f36cb5dea6a15d8d3cb272000e..f46f2c28854dde35f6e1aabbc3e21efe75d280f1 100644 (file)
--- 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 ead337310cf4768a933ecc20676255957f1d9dda..276542df640142815ba91cf8712371a6cfe1c349 100644 (file)
--- 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