4 files changed, 17 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1eb83eff0..55bdc849a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    Antti Tapaninen <aet@cc.hut.fi>
  - (djm) Define BROKEN_REALPATH for AIX, patch from 
    Antti Tapaninen <aet@cc.hut.fi>
+ - (djm) Bug #214: Fix utmp for Irix (don't strip "tty"). Patch from 
+   Kevin Taylor <no@nowhere.org> (??) via Philipp Grau
+   <phgrau@zedat.fu-berlin.de>
  - (djm) Bug #213: Simplify CMSG_ALIGN macros to avoid symbol clashes. 
    Reported by Doug Manton <dmanton@emea.att.com>
  - (djm) Bug #222: Fix tests for getaddrinfo on OSF/1. Spotted by
@@ -482,4 +485,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2075 2002/04/23 12:59:51 djm Exp $
+$Id: ChangeLog,v 1.2076 2002/04/23 13:09:19 djm Exp $
diff --git a/acconfig.h b/acconfig.h
index 84bf60f04..8a6f9411e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.131 2002/04/13 01:04:41 djm Exp $ */
+/* $Id: acconfig.h,v 1.132 2002/04/23 13:09:19 djm Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -346,6 +346,9 @@
 /* Define if you want to use OpenSSL's internally seeded PRNG only */
 #undef OPENSSL_PRNG_ONLY
 
+/* Define if you shouldn't strip 'tty' from your ttyname in [uw]tmp */
+#undef WITH_ABBREV_NO_TTY
+
 @BOTTOM@
 
 /* ******************* Shouldn't need to edit below this line ************** */
diff --git a/configure.ac b/configure.ac
index b1511e59c..f4ec16a00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.49 2002/04/23 12:52:46 djm Exp $
+# $Id: configure.ac,v 1.50 2002/04/23 13:09:19 djm Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -107,6 +107,7 @@ case "$host" in
         LDFLAGS="$LDFLAGS"
         PATH="$PATH:/usr/etc"
         AC_DEFINE(BROKEN_INET_NTOA)
+        AC_DEFINE(WITH_ABBREV_NO_TTY)
         ;;
 *-*-irix6*)
         CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -117,6 +118,7 @@ case "$host" in
         AC_DEFINE(WITH_IRIX_AUDIT)
         AC_CHECK_FUNC(jlimit_startjob, [AC_DEFINE(WITH_IRIX_JOBS)])
         AC_DEFINE(BROKEN_INET_NTOA)
+        AC_DEFINE(WITH_ABBREV_NO_TTY)
         ;;
 *-*-linux*)
         no_dev_ptmx=1
diff --git a/loginrec.c b/loginrec.c
index ea3ec4f2b..609e84768 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -163,7 +163,7 @@
 #include "log.h"
 #include "atomicio.h"
 
-RCSID("$Id: loginrec.c,v 1.39 2002/02/25 01:56:47 tim Exp $");
+RCSID("$Id: loginrec.c,v 1.40 2002/04/23 13:09:19 djm Exp $");
 
 #ifdef HAVE_UTIL_H
 #  include <util.h>
@@ -564,6 +564,11 @@ line_abbrevname(char *dst, const char *src, int dstsize)
         if (strncmp(src, "/dev/", 5) == 0)
                 src += 5;
 
+#ifdef WITH_ABBREV_NO_TTY
+        if (strncmp(src, "tty", 3) == 0)
+                src += 3;
+#endif
+
         len = strlen(src);
 
         if (len > 0) {