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
This commit is contained in:
Kris Kennaway 2000-09-04 08:43:05 +00:00
parent 97804a5c99
commit 5ed779ad1e
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=65433

View file

@ -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 */