svn commit: r187017 - in stable/7: contrib/telnet contrib/telnet/arpa include include/arpa

[Antoine Brodin]

Author: antoine
Date: Sat Jan 10 11:45:47 2009
New Revision: 187017
URL: http://svn.freebsd.org/changeset/base/187017

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

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

Modified: stable/7/contrib/telnet/arpa/telnet.h
==============================================================================
--- stable/7/contrib/telnet/arpa/telnet.h	Sat Jan 10 10:58:41 2009	(r187016)
+++ stable/7/contrib/telnet/arpa/telnet.h	Sat Jan 10 11:45:47 2009	(r187017)
@@ -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/7/include/arpa/telnet.h
==============================================================================
--- stable/7/include/arpa/telnet.h	Sat Jan 10 10:58:41 2009	(r187016)
+++ stable/7/include/arpa/telnet.h	Sat Jan 10 11:45:47 2009	(r187017)
@@ -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