tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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>
This commit is contained in:
Damien Miller 2002-04-23 23:09:19 +10:00
parent d77facda1a
commit f1b9d11a3e
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -6,6 +6,9 @@
Antti Tapaninen <aet@cc.hut.fi> Antti Tapaninen <aet@cc.hut.fi>
- (djm) Define BROKEN_REALPATH for AIX, patch from - (djm) Define BROKEN_REALPATH for AIX, patch from
Antti Tapaninen <aet@cc.hut.fi> 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. - (djm) Bug #213: Simplify CMSG_ALIGN macros to avoid symbol clashes.
Reported by Doug Manton <dmanton@emea.att.com> Reported by Doug Manton <dmanton@emea.att.com>
- (djm) Bug #222: Fix tests for getaddrinfo on OSF/1. Spotted by - (djm) Bug #222: Fix tests for getaddrinfo on OSF/1. Spotted by
@ -482,4 +485,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (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 $

5
acconfig.h
View File

@ -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 #ifndef _CONFIG_H
#define _CONFIG_H #define _CONFIG_H
@ -346,6 +346,9 @@
/* Define if you want to use OpenSSL's internally seeded PRNG only */ /* Define if you want to use OpenSSL's internally seeded PRNG only */
#undef OPENSSL_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@ @BOTTOM@
/* ******************* Shouldn't need to edit below this line ************** */ /* ******************* Shouldn't need to edit below this line ************** */

4
configure.ac
View File

@ -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_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -107,6 +107,7 @@ case "$host" in
LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS"
PATH="$PATH:/usr/etc" PATH="$PATH:/usr/etc"
AC_DEFINE(BROKEN_INET_NTOA) AC_DEFINE(BROKEN_INET_NTOA)
AC_DEFINE(WITH_ABBREV_NO_TTY)
;; ;;
*-*-irix6*) *-*-irix6*)
CPPFLAGS="$CPPFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@ -117,6 +118,7 @@ case "$host" in
AC_DEFINE(WITH_IRIX_AUDIT) AC_DEFINE(WITH_IRIX_AUDIT)
AC_CHECK_FUNC(jlimit_startjob, [AC_DEFINE(WITH_IRIX_JOBS)]) AC_CHECK_FUNC(jlimit_startjob, [AC_DEFINE(WITH_IRIX_JOBS)])
AC_DEFINE(BROKEN_INET_NTOA) AC_DEFINE(BROKEN_INET_NTOA)
AC_DEFINE(WITH_ABBREV_NO_TTY)
;; ;;
*-*-linux*) *-*-linux*)
no_dev_ptmx=1 no_dev_ptmx=1

7
loginrec.c
View File

@ -163,7 +163,7 @@
#include "log.h" #include "log.h"
#include "atomicio.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 #ifdef HAVE_UTIL_H
# include <util.h> # include <util.h>
@ -564,6 +564,11 @@ line_abbrevname(char *dst, const char *src, int dstsize)
if (strncmp(src, "/dev/", 5) == 0) if (strncmp(src, "/dev/", 5) == 0)
src += 5; src += 5;
#ifdef WITH_ABBREV_NO_TTY
if (strncmp(src, "tty", 3) == 0)
src += 3;
#endif
len = strlen(src); len = strlen(src);
if (len > 0) { if (len > 0) {