diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2001-07-24 15:28:25 +0000 | 
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2001-07-24 15:28:25 +0000 | 
| commit | 8ab8ce5e6e451b9c4eba9acb32123bfb1c412a7f (patch) | |
| tree | 82cf0374e4cae9a70e069569e61f1ea90d3af9e2 /security/krb5/files/patch-appl::telnet::telnetd::telnetd.c | |
| parent | add lsmlib (diff) | |
Update telnetd vulnerability fixes from FreeBSD.
Submitted by:	Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>
Diffstat (limited to '')
| -rw-r--r-- | security/krb5/files/patch-appl::telnet::telnetd::telnetd.c | 22 | 
1 files changed, 18 insertions, 4 deletions
diff --git a/security/krb5/files/patch-appl::telnet::telnetd::telnetd.c b/security/krb5/files/patch-appl::telnet::telnetd::telnetd.c index 0f1a14886101..9eef1709beeb 100644 --- a/security/krb5/files/patch-appl::telnet::telnetd::telnetd.c +++ b/security/krb5/files/patch-appl::telnet::telnetd::telnetd.c @@ -1,5 +1,14 @@  --- appl/telnet/telnetd/telnetd.c.orig	Wed Feb 28 14:06:51 2001 -+++ appl/telnet/telnetd/telnetd.c	Thu Jul 19 19:20:46 2001 ++++ appl/telnet/telnetd/telnetd.c	Mon Jul 23 17:27:05 2001 +@@ -693,7 +693,7 @@ +     char *error_message = + 	"Encryption was not successfully negotiated.  Goodbye.\r\n\r\n"; +  +-    writenet(error_message, strlen(error_message)); ++    output_datalen(error_message, strlen(error_message)); +     netflush(); +     exit(1); + }  @@ -782,9 +782,7 @@   			{ IAC, SB, TELOPT_TSPEED, TELQUAL_SEND, IAC, SE }; @@ -106,7 +115,7 @@   					neturg = nfrontp-1; /* off by one XXX */   #endif   				} -@@ -1495,8 +1477,7 @@ +@@ -1495,13 +1477,11 @@   					    ptyibuf[0] & TIOCPKT_DOSTOP ? 1 : 0;   					if (newflow != flowmode) {   						flowmode = newflow; @@ -116,7 +125,12 @@   							IAC, SB, TELOPT_LFLOW,   							flowmode ? LFLOW_ON   								 : LFLOW_OFF, -@@ -1524,19 +1505,19 @@ + 							IAC, SE); +-						nfrontp += 6; + 					} + 				} + 				pcc--; +@@ -1524,19 +1504,19 @@   				break;   			c = *ptyip++ & 0377, pcc--;   			if (c == IAC) @@ -141,7 +155,7 @@   			}   		}   #if	defined(CRAY2) && defined(UNICOS5) -@@ -1707,10 +1688,7 @@ +@@ -1707,10 +1687,7 @@   		return;   	}   #endif  | 
