summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-03-21 11:11:57 +1100
committerDamien Miller <djm@mindrot.org>2001-03-21 11:11:57 +1100
commitbe08176963af1b75f6fff9c28e941763476eeb30 (patch)
tree474d5d13f8135329bc577c9c80879a59bc4d377c /session.c
parentd9d5ba2bbde89fe058d8db39d0ec3f1d4ec5e6f8 (diff)
downloadopenssh-git-be08176963af1b75f6fff9c28e941763476eeb30.tar.gz
- (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve
VanDevender <stevev@darkwing.uoregon.edu>
Diffstat (limited to 'session.c')
-rw-r--r--session.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/session.c b/session.c
index 9c4828ac..31a16dc7 100644
--- a/session.c
+++ b/session.c
@@ -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));