diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | defines.h | 6 |
4 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20040406 | ||
2 | - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use | ||
3 | updwtmpx() on IRIX since it seems to clobber utmp. ok djm@ | ||
4 | |||
1 | 20040330 | 5 | 20040330 |
2 | - (dtucker) [configure.ac] Bug #811: Use "!" for LOCKED_PASSWD_PREFIX on | 6 | - (dtucker) [configure.ac] Bug #811: Use "!" for LOCKED_PASSWD_PREFIX on |
3 | Linuxes, since that's what many use. ok djm@ | 7 | Linuxes, since that's what many use. ok djm@ |
@@ -930,4 +934,4 @@ | |||
930 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 934 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
931 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 935 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
932 | 936 | ||
933 | $Id: ChangeLog,v 1.3299 2004/03/31 05:17:54 djm Exp $ | 937 | $Id: ChangeLog,v 1.3300 2004/04/06 11:31:12 dtucker Exp $ |
diff --git a/acconfig.h b/acconfig.h index 62252d760..a1f4556f8 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.173 2004/02/06 05:24:31 dtucker Exp $ */ | 1 | /* $Id: acconfig.h,v 1.174 2004/04/06 11:31:13 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -347,6 +347,9 @@ | |||
347 | /* getaddrinfo is broken (if present) */ | 347 | /* getaddrinfo is broken (if present) */ |
348 | #undef BROKEN_GETADDRINFO | 348 | #undef BROKEN_GETADDRINFO |
349 | 349 | ||
350 | /* updwtmpx is broken (if present) */ | ||
351 | #undef BROKEN_UPDWTMPX | ||
352 | |||
350 | /* Workaround more Linux IPv6 quirks */ | 353 | /* Workaround more Linux IPv6 quirks */ |
351 | #undef DONT_TRY_OTHER_AF | 354 | #undef DONT_TRY_OTHER_AF |
352 | 355 | ||
diff --git a/configure.ac b/configure.ac index 11a1812b3..2d2147518 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.207 2004/03/30 04:03:46 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.208 2004/04/06 11:31:13 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -235,6 +235,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
235 | AC_DEFINE(SETEUID_BREAKS_SETUID) | 235 | AC_DEFINE(SETEUID_BREAKS_SETUID) |
236 | AC_DEFINE(BROKEN_SETREUID) | 236 | AC_DEFINE(BROKEN_SETREUID) |
237 | AC_DEFINE(BROKEN_SETREGID) | 237 | AC_DEFINE(BROKEN_SETREGID) |
238 | AC_DEFINE(BROKEN_UPDWTMPX) | ||
238 | AC_DEFINE(WITH_ABBREV_NO_TTY) | 239 | AC_DEFINE(WITH_ABBREV_NO_TTY) |
239 | AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") | 240 | AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") |
240 | ;; | 241 | ;; |
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.111 2004/03/04 11:59:37 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.112 2004/04/06 11:31:13 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -507,6 +507,10 @@ struct winsize { | |||
507 | # undef HAVE_GAI_STRERROR | 507 | # undef HAVE_GAI_STRERROR |
508 | #endif | 508 | #endif |
509 | 509 | ||
510 | #if defined(BROKEN_UPDWTMPX) && defined(HAVE_UPDWTMPX) | ||
511 | # undef HAVE_UPDWTMPX | ||
512 | #endif | ||
513 | |||
510 | #if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) | 514 | #if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) |
511 | # define memmove(s1, s2, n) bcopy((s2), (s1), (n)) | 515 | # define memmove(s1, s2, n) bcopy((s2), (s1), (n)) |
512 | #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ | 516 | #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ |