diff options
author | Damien Miller <djm@mindrot.org> | 2001-03-21 11:11:57 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-03-21 11:11:57 +1100 |
commit | be08176963af1b75f6fff9c28e941763476eeb30 (patch) | |
tree | 474d5d13f8135329bc577c9c80879a59bc4d377c | |
parent | d9d5ba2bbde89fe058d8db39d0ec3f1d4ec5e6f8 (diff) | |
download | openssh-git-be08176963af1b75f6fff9c28e941763476eeb30.tar.gz |
- (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve
VanDevender <stevev@darkwing.uoregon.edu>
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | session.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,7 @@ +20010321 + - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve + VanDevender <stevev@darkwing.uoregon.edu> + 20010320 - (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS). - (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS). @@ -4645,4 +4649,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.993 2001/03/20 04:46:50 tim Exp $ +$Id: ChangeLog,v 1.994 2001/03/21 00:11:57 djm Exp $ @@ -1053,7 +1053,7 @@ do_child(Session *s, const char *command) switch, so we let login(1) to this for us. */ if (!options.use_login) { #ifdef HAVE_OSF_SIA - session_setup_sia(pw->pw_name, ttyname); + session_setup_sia(pw->pw_name, s->tty); #else /* HAVE_OSF_SIA */ #ifdef HAVE_CYGWIN if (is_winnt) { @@ -1134,10 +1134,10 @@ do_child(Session *s, const char *command) * other stuff is stored - a few applications * actually use this and die if it's not set */ - cp = xmalloc(22 + strlen(ttyname) + + cp = xmalloc(22 + strlen(s->tty) + 2 * strlen(pw->pw_name)); i = sprintf(cp, "LOGNAME=%s%cNAME=%s%cTTY=%s%c%c", - pw->pw_name, 0, pw->pw_name, 0, ttyname, 0,0); + pw->pw_name, 0, pw->pw_name, 0, s->tty, 0,0); if (usrinfo(SETUINFO, cp, i) == -1) fatal("Couldn't set usrinfo: %s", strerror(errno)); |