Index: sys_term.c =================================================================== RCS file: /cvsroot/src/libexec/telnetd/sys_term.c,v retrieving revision 1.48 diff -u -r1.48 sys_term.c --- sys_term.c 13 Dec 2018 04:29:18 -0000 1.48 +++ sys_term.c 15 Aug 2019 01:03:38 -0000 @@ -177,13 +177,6 @@ * * Returns the file descriptor of the opened pty. */ -#ifndef __GNUC__ -char *line = NULL16STR; -#else -static char Xline[] = NULL16STR; -char *line = Xline; -#endif - static int ptyslavefd; /* for cleanopen() */ Index: telnetd.c =================================================================== RCS file: /cvsroot/src/libexec/telnetd/telnetd.c,v retrieving revision 1.55 diff -u -r1.55 telnetd.c --- telnetd.c 27 Feb 2014 18:20:21 -0000 1.55 +++ telnetd.c 15 Aug 2019 01:03:38 -0000 @@ -86,18 +86,10 @@ #include #endif -#ifdef AUTHENTICATION -int auth_level = 0; -#endif - #if defined(AUTHENTICATION) || defined(ENCRYPTION) #include #endif -#ifdef SECURELOGIN -int require_secure_login = 0; -#endif - extern int require_hwpreauth; #ifdef KRB5 extern krb5_context telnet_context; @@ -164,6 +156,8 @@ int main(int argc, char *argv[]) { + static char Xline[] = NULL16STR; + socklen_t fromlen; int on = 1; int ch; @@ -171,6 +165,8 @@ int tos = -1; #endif + line = Xline; + pfrontp = pbackp = ptyobuf; netip = netibuf; nfrontp = nbackp = netobuf;