2 files changed, 3 insertions, 9 deletions

diff --git a/secure/libexec/telnetd/sys_term.c b/secure/libexec/telnetd/sys_term.c
index ed171f119651..7d17dfb5d9d7 100644
--- a/secure/libexec/telnetd/sys_term.c
+++ b/secure/libexec/telnetd/sys_term.c
@@ -1779,12 +1779,6 @@ start_login(host, autologin, name)
 		close(pty);
 #endif
 	closelog();
-	/*
-	 * This sleep(1) is in here so that telnetd can
-	 * finish up with the tty.  There's a race condition
-	 * the login banner message gets lost...
-	 */
-	sleep(1);
 	execv(_PATH_LOGIN, argv);
 
 	syslog(LOG_ERR, "%s: %m\n", _PATH_LOGIN);
diff --git a/secure/libexec/telnetd/telnetd.c b/secure/libexec/telnetd/telnetd.c
index 86efc5b1abfc..707c68ad6fe9 100644
--- a/secure/libexec/telnetd/telnetd.c
+++ b/secure/libexec/telnetd/telnetd.c
@@ -782,6 +782,8 @@ char remote_host_name[MAXHOSTNAMELEN];
 
 extern void telnet P((int, int, char *));
 
+int level;
+char user_name[256];
 /*
  * Get a pty, scan input lines.
  */
@@ -791,9 +793,7 @@ doit(who)
 	char *host, *inet_ntoa();
 	int t;
 	struct hostent *hp;
-	int level;
 	int ptynum;
-	char user_name[256];
 
 	/*
 	 * Find an available pty to use.
@@ -1149,7 +1149,7 @@ telnet(f, p, host)
 	 * now.  We delay this until here to insure option negotiation
 	 * is complete.
 	 */
-	startslave(host);
+	startslave(host, level, user_name);
 
 	nfd = ((f > p) ? f : p) + 1;
 	for (;;) {