svn commit: r187026 - in stable/6: contrib/telnet contrib/telnet/arpa include include/arpa

Antoine Brodin antoine at FreeBSD.org
Sat Jan 10 08:57:23 PST 2009


Author: antoine
Date: Sat Jan 10 16:57:22 2009
New Revision: 187026
URL: http://svn.freebsd.org/changeset/base/187026

Log:
  MFC r183004 to stable/6:
    Fix TELOPT(opt) when opt > TELOPT_TN3270E.
  
    PR:		127194
    Submitted by:	Joost Bekkers
    MFC after:	1 month

Modified:
  stable/6/contrib/telnet/   (props changed)
  stable/6/contrib/telnet/arpa/telnet.h
  stable/6/include/   (props changed)
  stable/6/include/arpa/telnet.h

Modified: stable/6/contrib/telnet/arpa/telnet.h
==============================================================================
--- stable/6/contrib/telnet/arpa/telnet.h	Sat Jan 10 16:42:13 2009	(r187025)
+++ stable/6/contrib/telnet/arpa/telnet.h	Sat Jan 10 16:57:22 2009	(r187026)
@@ -140,8 +140,8 @@ const char *telopts[NTELOPTS+1] = {
 	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
 	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
 	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
-	"ENCRYPT", "NEW-ENVIRON", "TN3270E", "CHARSET", "COM-PORT",
-	"KERMIT",
+	"ENCRYPT", "NEW-ENVIRON", "TN3270E", "XAUTH", "CHARSET",
+	"RSP", "COM-PORT", "SLE", "STARTTLS", "KERMIT",
 	0
 };
 #define	TELOPT_FIRST	TELOPT_BINARY

Modified: stable/6/include/arpa/telnet.h
==============================================================================
--- stable/6/include/arpa/telnet.h	Sat Jan 10 16:42:13 2009	(r187025)
+++ stable/6/include/arpa/telnet.h	Sat Jan 10 16:57:22 2009	(r187026)
@@ -140,8 +140,8 @@ const char *telopts[NTELOPTS+1] = {
 	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
 	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
 	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
-	"ENCRYPT", "NEW-ENVIRON", "TN3270E", "CHARSET", "COM-PORT",
-	"KERMIT",
+	"ENCRYPT", "NEW-ENVIRON", "TN3270E", "XAUTH", "CHARSET",
+	"RSP", "COM-PORT", "SLE", "STARTTLS", "KERMIT",
 	0
 };
 #define	TELOPT_FIRST	TELOPT_BINARY


More information about the svn-src-stable-6 mailing list