From 5ed779ad1e5b982305f321d0d164a7e98e259ea6 Mon Sep 17 00:00:00 2001 From: Kris Kennaway Date: Mon, 4 Sep 2000 08:43:05 +0000 Subject: [PATCH] ttyname was not being passed into do_login(), so we were erroneously picking up the function definition from unistd.h instead. Use s->tty instead. Submitted by: peter --- crypto/openssh/session.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index f56e629751de..a385c8ed7f97 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -637,7 +637,7 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw) "Sorry -- your account has expired.\n"); log( "LOGIN %.200s REFUSED (EXPIRED) FROM %.200s ON TTY %.200s", - pw->pw_name, hostname, ttyname); + pw->pw_name, hostname, s->tty); exit(254); } else if (pw->pw_expire - tv.tv_sec < warntime && !quiet_login) @@ -647,11 +647,11 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw) } #endif /* __FreeBSD__ */ #ifdef LOGIN_CAP - if (!auth_ttyok(lc, ttyname)) { + if (!auth_ttyok(lc, s->tty)) { (void)printf("Permission denied.\n"); log( "LOGIN %.200s REFUSED (TTY) FROM %.200s ON TTY %.200s", - pw->pw_name, hostname, ttyname); + pw->pw_name, hostname, s->tty); exit(254); } #endif /* LOGIN_CAP */