From owner-svn-src-all@FreeBSD.ORG  Sat Jan 10 16:57:23 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F85C1065677;
	Sat, 10 Jan 2009 16:57:23 +0000 (UTC)
	(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B5C88FC12;
	Sat, 10 Jan 2009 16:57:23 +0000 (UTC)
	(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AGvMmx003743;
	Sat, 10 Jan 2009 16:57:22 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0AGvMMk003741;
	Sat, 10 Jan 2009 16:57:22 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <200901101657.n0AGvMMk003741@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 10 Jan 2009 16:57:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187026 - in stable/6: contrib/telnet
	contrib/telnet/arpa include include/arpa
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2009 16:57:23 -0000

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