Add back gettytab reading but use cget* instead of the obsolescent gtget*

1 files changed, 10 insertions, 1 deletions

diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c
index 67a0a5e7dbd..0b8d19a0dd3 100644
--- a/libexec/telnetd/sys_term.c
+++ b/libexec/telnetd/sys_term.c
@@ -179,7 +179,7 @@ char	wtmpf[]	= "/etc/wtmp";
      int really_stream = 0;
 # endif
 
-     const char *new_login = _PATH_LOGIN;
+     char *new_login = NULL;
 
 /*
  * init_termbuf()
@@ -1273,6 +1273,8 @@ start_login(const char *host, int autologin, char *name)
     struct arg_val argv;
     char *user;
     int save_errno;
+    char *buf;
+    extern char *gettytab[2], *gettyent;
 
 #ifdef HAVE_UTMPX_H
     int pid = getpid();
@@ -1347,6 +1349,13 @@ start_login(const char *host, int autologin, char *name)
 	addarg(&argv, "--");
 	addarg(&argv, strdup(user));
     }
+    if (new_login == NULL && cgetent(&buf, gettytab, gettyent) >= 0) {
+	cgetstr(buf, "lo", &new_login);
+	cgetclose();
+    }
+    if (new_login == NULL)
+	new_login = _PATH_LOGIN;
+
     if (getenv("USER")) {
 	/*
 	 * Assume that login will set the USER variable