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 /session.c | |
parent | d9d5ba2bbde89fe058d8db39d0ec3f1d4ec5e6f8 (diff) |
- (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.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1053,7 +1053,7 @@ do_child(Session *s, const char *command) | |||
1053 | switch, so we let login(1) to this for us. */ | 1053 | switch, so we let login(1) to this for us. */ |
1054 | if (!options.use_login) { | 1054 | if (!options.use_login) { |
1055 | #ifdef HAVE_OSF_SIA | 1055 | #ifdef HAVE_OSF_SIA |
1056 | session_setup_sia(pw->pw_name, ttyname); | 1056 | session_setup_sia(pw->pw_name, s->tty); |
1057 | #else /* HAVE_OSF_SIA */ | 1057 | #else /* HAVE_OSF_SIA */ |
1058 | #ifdef HAVE_CYGWIN | 1058 | #ifdef HAVE_CYGWIN |
1059 | if (is_winnt) { | 1059 | if (is_winnt) { |
@@ -1134,10 +1134,10 @@ do_child(Session *s, const char *command) | |||
1134 | * other stuff is stored - a few applications | 1134 | * other stuff is stored - a few applications |
1135 | * actually use this and die if it's not set | 1135 | * actually use this and die if it's not set |
1136 | */ | 1136 | */ |
1137 | cp = xmalloc(22 + strlen(ttyname) + | 1137 | cp = xmalloc(22 + strlen(s->tty) + |
1138 | 2 * strlen(pw->pw_name)); | 1138 | 2 * strlen(pw->pw_name)); |
1139 | i = sprintf(cp, "LOGNAME=%s%cNAME=%s%cTTY=%s%c%c", | 1139 | i = sprintf(cp, "LOGNAME=%s%cNAME=%s%cTTY=%s%c%c", |
1140 | pw->pw_name, 0, pw->pw_name, 0, ttyname, 0,0); | 1140 | pw->pw_name, 0, pw->pw_name, 0, s->tty, 0,0); |
1141 | if (usrinfo(SETUINFO, cp, i) == -1) | 1141 | if (usrinfo(SETUINFO, cp, i) == -1) |
1142 | fatal("Couldn't set usrinfo: %s", | 1142 | fatal("Couldn't set usrinfo: %s", |
1143 | strerror(errno)); | 1143 | strerror(errno)); |