d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid race condition with telnet options processing (login: prompt lost).

Browse Source 
Submitted by:	John Capo & Peter Wemm
This commit is contained in:
Paul Traina 1995-09-05 19:31:06 +00:00
parent d0d1fb6198
commit a06a8a9829
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=10563
2 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
eBones/libexec/telnetd/telnetd.c
View File

@ -780,11 +780,7 @@ char *hostname;
char host_name[MAXHOSTNAMELEN];
char remote_host_name[MAXHOSTNAMELEN];
#ifndef convex
extern void telnet P((int, int));
#else
extern void telnet P((int, int, char *));
#endif
/*
* Get a pty, scan input lines.
@ -875,12 +871,6 @@ doit(who)
level = getterminaltype(user_name);
setenv("TERM", terminaltype ? terminaltype : "network", 1);
/*
* Start up the login process on the slave side of the terminal
*/
#ifndef convex
startslave(host, level, user_name);
#if defined(_SC_CRAY_SECURE_SYS)
if (secflag) {
if (setulvl(dv.dv_actlvl) < 0)
@ -890,10 +880,8 @@ doit(who)
}
#endif /* _SC_CRAY_SECURE_SYS */
telnet(net, pty); /* begin server processing */
#else
telnet(net, pty, host);
#endif
telnet(net, pty, host); /* begin server process */
/*NOTREACHED*/
} /* end of doit */
@ -917,15 +905,9 @@ Xterm_output(ibufp, obuf, icountp, ocount)
* hand data to telnet receiver finite state machine.
*/
void
#ifndef convex
telnet(f, p)
#else
telnet(f, p, host)
#endif
int f, p;
#ifdef convex
char *host;
#endif
{
int on = 1;
#define TABBUFSIZ 512
@ -1162,9 +1144,12 @@ telnet(f, p, host)
{sprintf(nfrontp, "td: Entering processing loop\r\n");
nfrontp += strlen(nfrontp);});
#ifdef convex
/*
* Startup the login process on the slave side of the terminal
* now. We delay this until here to insure option negotiation
* is complete.
*/
startslave(host);
#endif
nfd = ((f > p) ? f : p) + 1;
for (;;) {

29
secure/libexec/telnetd/telnetd.c
View File

@ -780,11 +780,7 @@ char *hostname;
char host_name[MAXHOSTNAMELEN];
char remote_host_name[MAXHOSTNAMELEN];
#ifndef convex
extern void telnet P((int, int));
#else
extern void telnet P((int, int, char *));
#endif
/*
* Get a pty, scan input lines.
@ -875,12 +871,6 @@ doit(who)
level = getterminaltype(user_name);
setenv("TERM", terminaltype ? terminaltype : "network", 1);
/*
* Start up the login process on the slave side of the terminal
*/
#ifndef convex
startslave(host, level, user_name);
#if defined(_SC_CRAY_SECURE_SYS)
if (secflag) {
if (setulvl(dv.dv_actlvl) < 0)
@ -890,10 +880,8 @@ doit(who)
}
#endif /* _SC_CRAY_SECURE_SYS */
telnet(net, pty); /* begin server processing */
#else
telnet(net, pty, host);
#endif
telnet(net, pty, host); /* begin server process */
/*NOTREACHED*/
} /* end of doit */
@ -917,15 +905,9 @@ Xterm_output(ibufp, obuf, icountp, ocount)
* hand data to telnet receiver finite state machine.
*/
void
#ifndef convex
telnet(f, p)
#else
telnet(f, p, host)
#endif
int f, p;
#ifdef convex
char *host;
#endif
{
int on = 1;
#define TABBUFSIZ 512
@ -1162,9 +1144,12 @@ telnet(f, p, host)
{sprintf(nfrontp, "td: Entering processing loop\r\n");
nfrontp += strlen(nfrontp);});
#ifdef convex
/*
* Startup the login process on the slave side of the terminal
* now. We delay this until here to insure option negotiation
* is complete.
*/
startslave(host);
#endif
nfd = ((f > p) ? f : p) + 1;
for (;;) {