diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-09-27 20:46:14 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-09-27 20:46:14 +1000 |
| commit | e47760c2cb3c7f2ca7e878bd15f2d34a66dea7f9 (patch) | |
| tree | 21e51af4820994cdd1403dd90226edbcc7f97193 | |
| parent | cba3b437786443528db085817b19b244ffa649d2 (diff) | |
- (dtucker) [configure.ac defines.h] Shadow expiry does not work on QNX6V_4_7
so disable it for that platform. From bacon at cs nyu edu.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | defines.h | 6 |
3 files changed, 11 insertions, 4 deletions
@@ -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. 20070917 - (tim) [defines.h] Fix regression in long password support on OpenServer 6. @@ -3196,4 +3198,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.4738.2.4 2007/09/27 10:43:48 dtucker Exp $ +$Id: ChangeLog,v 1.4738.2.5 2007/09/27 10:46:14 dtucker Exp $ diff --git a/configure.ac b/configure.ac index e11f4203..6f3248dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.383.2.2 2007/09/27 10:43:49 dtucker Exp $ +# $Id: configure.ac,v 1.383.2.3 2007/09/27 10:46:15 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.383.2.2 $) +AC_REVISION($Revision: 1.383.2.3 $) 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*) @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.143.2.1 2007/09/17 15:33:47 tim Exp $ */ +/* $Id: defines.h,v 1.143.2.2 2007/09/27 10:46:15 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 |