[Midnightbsd-cvs] src [7183] trunk/contrib/telnet: sync-up telnet code
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Jul 27 21:15:21 EDT 2015
Revision: 7183
http://svnweb.midnightbsd.org/src/?rev=7183
Author: laffer1
Date: 2015-07-27 21:15:21 -0400 (Mon, 27 Jul 2015)
Log Message:
-----------
sync-up telnet code
Modified Paths:
--------------
trunk/contrib/telnet/arpa/telnet.h
trunk/contrib/telnet/libtelnet/auth-proto.h
trunk/contrib/telnet/libtelnet/auth.c
trunk/contrib/telnet/libtelnet/auth.h
trunk/contrib/telnet/libtelnet/enc-proto.h
trunk/contrib/telnet/libtelnet/enc_des.c
trunk/contrib/telnet/libtelnet/encrypt.c
trunk/contrib/telnet/libtelnet/encrypt.h
trunk/contrib/telnet/libtelnet/genget.c
trunk/contrib/telnet/libtelnet/getent.c
trunk/contrib/telnet/libtelnet/kerberos.c
trunk/contrib/telnet/libtelnet/kerberos5.c
trunk/contrib/telnet/libtelnet/key-proto.h
trunk/contrib/telnet/libtelnet/krb4encpwd.c
trunk/contrib/telnet/libtelnet/misc-proto.h
trunk/contrib/telnet/libtelnet/misc.c
trunk/contrib/telnet/libtelnet/pk.c
trunk/contrib/telnet/libtelnet/pk.h
trunk/contrib/telnet/libtelnet/read_password.c
trunk/contrib/telnet/libtelnet/rsaencpwd.c
trunk/contrib/telnet/libtelnet/sra.c
trunk/contrib/telnet/telnet/authenc.c
trunk/contrib/telnet/telnet/commands.c
trunk/contrib/telnet/telnet/defines.h
trunk/contrib/telnet/telnet/externs.h
trunk/contrib/telnet/telnet/main.c
trunk/contrib/telnet/telnet/network.c
trunk/contrib/telnet/telnet/ring.c
trunk/contrib/telnet/telnet/ring.h
trunk/contrib/telnet/telnet/sys_bsd.c
trunk/contrib/telnet/telnet/telnet.1
trunk/contrib/telnet/telnet/telnet.c
trunk/contrib/telnet/telnet/terminal.c
trunk/contrib/telnet/telnet/types.h
trunk/contrib/telnet/telnet/utilities.c
Modified: trunk/contrib/telnet/arpa/telnet.h
===================================================================
--- trunk/contrib/telnet/arpa/telnet.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/arpa/telnet.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)telnet.h 8.2 (Berkeley) 12/15/93
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/arpa/telnet.h 275508 2014-12-05 12:23:29Z ngie $
*/
#ifndef _ARPA_TELNET_H_
@@ -127,6 +127,7 @@
#define TELOPT_KERMIT 47 /* RFC2840 - Kermit */
#define TELOPT_EXOPL 255 /* extended-options-list */
+#define COMPORT_SET_BAUDRATE 1 /* RFC2217 - Com Port Set Baud Rate */
#define NTELOPTS (1+TELOPT_KERMIT)
#ifdef TELOPTS
Modified: trunk/contrib/telnet/libtelnet/auth-proto.h
===================================================================
--- trunk/contrib/telnet/libtelnet/auth-proto.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/auth-proto.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)auth-proto.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/libtelnet/auth-proto.h 87155 2001-11-30 22:28:07Z markm $
*/
/*
Modified: trunk/contrib/telnet/libtelnet/auth.c
===================================================================
--- trunk/contrib/telnet/libtelnet/auth.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/auth.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -38,7 +38,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/auth.c 114630 2003-05-04 02:54:49Z obrien $");
/*
Modified: trunk/contrib/telnet/libtelnet/auth.h
===================================================================
--- trunk/contrib/telnet/libtelnet/auth.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/auth.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)auth.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/libtelnet/auth.h 87139 2001-11-30 21:06:38Z markm $
*/
/*
Modified: trunk/contrib/telnet/libtelnet/enc-proto.h
===================================================================
--- trunk/contrib/telnet/libtelnet/enc-proto.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/enc-proto.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)enc-proto.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/libtelnet/enc-proto.h 87155 2001-11-30 22:28:07Z markm $
*/
/*
Modified: trunk/contrib/telnet/libtelnet/enc_des.c
===================================================================
--- trunk/contrib/telnet/libtelnet/enc_des.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/enc_des.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -37,7 +37,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/enc_des.c 114630 2003-05-04 02:54:49Z obrien $");
#ifdef ENCRYPTION
# ifdef AUTHENTICATION
Modified: trunk/contrib/telnet/libtelnet/encrypt.c
===================================================================
--- trunk/contrib/telnet/libtelnet/encrypt.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/encrypt.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/encrypt.c 228843 2011-12-23 15:00:37Z cperciva $");
#ifndef lint
#if 0
Modified: trunk/contrib/telnet/libtelnet/encrypt.h
===================================================================
--- trunk/contrib/telnet/libtelnet/encrypt.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/encrypt.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)encrypt.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/libtelnet/encrypt.h 87139 2001-11-30 21:06:38Z markm $
*/
/*
Modified: trunk/contrib/telnet/libtelnet/genget.c
===================================================================
--- trunk/contrib/telnet/libtelnet/genget.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/genget.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/genget.c 87139 2001-11-30 21:06:38Z markm $");
#ifndef lint
#if 0
Modified: trunk/contrib/telnet/libtelnet/getent.c
===================================================================
--- trunk/contrib/telnet/libtelnet/getent.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/getent.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/getent.c 87139 2001-11-30 21:06:38Z markm $");
#ifndef lint
#if 0
Modified: trunk/contrib/telnet/libtelnet/kerberos.c
===================================================================
--- trunk/contrib/telnet/libtelnet/kerberos.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/kerberos.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/kerberos.c 110049 2003-01-29 18:14:29Z nectar $");
#ifndef lint
static const char sccsid[] = "@(#)kerberos.c 8.3 (Berkeley) 5/30/95";
Modified: trunk/contrib/telnet/libtelnet/kerberos5.c
===================================================================
--- trunk/contrib/telnet/libtelnet/kerberos5.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/kerberos5.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/kerberos5.c 233932 2012-04-06 00:03:45Z stas $");
#ifdef KRB5
@@ -100,6 +100,16 @@
static krb5_context context;
static krb5_auth_context auth_context;
+static void
+print_krb5_error(krb5_context context, krb5_error_code code, const char *msg)
+{
+ const char *error_message;
+
+ error_message = krb5_get_error_message(context, code);
+ printf(msg, error_message);
+ krb5_free_error_message(context, error_message);
+}
+
static int
Data(Authenticator *ap, int type, const char *d, int c)
{
@@ -182,8 +192,7 @@
ret = krb5_cc_default(context, &ccache);
if (ret) {
if (auth_debug_mode) {
- printf("Kerberos V5: could not get default ccache: %s\r\n",
- krb5_get_err_text (context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: could not get default ccache: %s\r\n");
}
return 0;
}
@@ -197,8 +206,7 @@
ret = krb5_auth_con_init (context, &auth_context);
if (ret) {
if (auth_debug_mode) {
- printf("Kerberos V5: krb5_auth_con_init failed (%s)\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: krb5_auth_con_init failed (%s)\r\n");
}
return(0);
}
@@ -208,9 +216,8 @@
&net);
if (ret) {
if (auth_debug_mode) {
- printf ("Kerberos V5:"
- " krb5_auth_con_setaddrs_from_fd failed (%s)\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5:"
+ " krb5_auth_con_setaddrs_from_fd failed (%s)\r\n");
}
return(0);
}
@@ -236,9 +243,13 @@
&service);
if(ret) {
if (auth_debug_mode) {
- printf ("Kerberos V5:"
+ const char *err_str;
+
+ err_str = krb5_get_error_message(context, ret);
+ printf("Kerberosr V5:"
" krb5_sname_to_principal(%s) failed (%s)\r\n",
- RemoteHostName, krb5_get_err_text(context, ret));
+ RemoteHostName, err_str);
+ krb5_free_error_message(context, err_str);
}
return 0;
}
@@ -245,9 +256,8 @@
ret = krb5_unparse_name_fixed(context, service, sname, sizeof(sname));
if(ret) {
if (auth_debug_mode) {
- printf ("Kerberos V5:"
- " krb5_unparse_name_fixed failed (%s)\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5:"
+ " krb5_unparse_name_fixed failed (%s)\r\n");
}
return 0;
}
@@ -260,8 +270,7 @@
}
if (ret) {
if (1 || auth_debug_mode) {
- printf("Kerberos V5: mk_req failed (%s)\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: mk_req failed (%s)\r\n");
}
return(0);
}
@@ -319,8 +328,7 @@
Data(ap, KRB_REJECT, "krb5_auth_con_init failed", -1);
auth_finished(ap, AUTH_REJECT);
if (auth_debug_mode)
- printf("Kerberos V5: krb5_auth_con_init failed (%s)\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: krb5_auth_con_init failed (%s)\r\n");
return;
}
@@ -331,9 +339,8 @@
Data(ap, KRB_REJECT, "krb5_auth_con_setaddrs_from_fd failed", -1);
auth_finished(ap, AUTH_REJECT);
if (auth_debug_mode)
- printf("Kerberos V5: "
- "krb5_auth_con_setaddrs_from_fd failed (%s)\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: "
+ "krb5_auth_con_setaddrs_from_fd failed (%s)\r\n");
return;
}
@@ -346,9 +353,8 @@
Data(ap, KRB_REJECT, "krb5_sock_to_principal failed", -1);
auth_finished(ap, AUTH_REJECT);
if (auth_debug_mode)
- printf("Kerberos V5: "
- "krb5_sock_to_principal failed (%s)\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: "
+ "krb5_sock_to_principal failed (%s)\r\n");
return;
}
@@ -363,10 +369,12 @@
krb5_free_principal (context, server);
if (ret) {
char *errbuf;
+ const char *err_str;
+ err_str = krb5_get_error_message(context, ret);
asprintf(&errbuf,
- "Read req failed: %s",
- krb5_get_err_text(context, ret));
+ "Read req failed: %s", err_str);
+ krb5_free_error_message(context, err_str);
Data(ap, KRB_REJECT, errbuf, -1);
if (auth_debug_mode)
printf("%s\r\n", errbuf);
@@ -387,8 +395,11 @@
if (ret) {
char *errbuf;
- asprintf(&errbuf, "Bad checksum: %s",
- krb5_get_err_text(context, ret));
+ const char *err_str;
+
+ err_str = krb5_get_error_message(context, ret);
+ asprintf(&errbuf, "Bad checksum: %s", err_str);
+ krb5_free_error_message(context, err_str);
Data(ap, KRB_REJECT, errbuf, -1);
if (auth_debug_mode)
printf ("%s\r\n", errbuf);
@@ -404,9 +415,8 @@
Data(ap, KRB_REJECT, "krb5_auth_con_getremotesubkey failed", -1);
auth_finished(ap, AUTH_REJECT);
if (auth_debug_mode)
- printf("Kerberos V5: "
- "krb5_auth_con_getremotesubkey failed (%s)\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: "
+ "krb5_auth_con_getremotesubkey failed (%s)\r\n");
return;
}
@@ -419,9 +429,8 @@
Data(ap, KRB_REJECT, "krb5_auth_con_getkey failed", -1);
auth_finished(ap, AUTH_REJECT);
if (auth_debug_mode)
- printf("Kerberos V5: "
- "krb5_auth_con_getkey failed (%s)\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: "
+ "krb5_auth_con_getkey failed (%s)\r\n");
return;
}
if (key_block == NULL) {
@@ -440,9 +449,8 @@
"krb5_mk_rep failed", -1);
auth_finished(ap, AUTH_REJECT);
if (auth_debug_mode)
- printf("Kerberos V5: "
- "krb5_mk_rep failed (%s)\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: "
+ "krb5_mk_rep failed (%s)\r\n");
return;
}
Data(ap, KRB_RESPONSE, outbuf.data, outbuf.length);
@@ -509,8 +517,7 @@
ret = krb5_cc_resolve (context, ccname, &ccache);
if (ret) {
if (auth_debug_mode)
- printf ("Kerberos V5: could not get ccache: %s\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: could not get ccache: %s\r\n");
break;
}
@@ -519,8 +526,7 @@
ticket->client);
if (ret) {
if (auth_debug_mode)
- printf ("Kerberos V5: could not init ccache: %s\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: could not init ccache: %s\r\n");
break;
}
@@ -533,10 +539,12 @@
&inbuf);
if(ret) {
char *errbuf;
+ const char *err_str;
+ err_str = krb5_get_error_message(context, ret);
asprintf (&errbuf,
- "Read forwarded creds failed: %s",
- krb5_get_err_text (context, ret));
+ "Read forwarded creds failed: %s", err_str);
+ krb5_free_error_message(context, err_str);
if(errbuf == NULL)
Data(ap, KRB_FORWARD_REJECT, NULL, 0);
else
@@ -604,8 +612,7 @@
auth_context,
&keyblock);
if(ret) {
- printf("[ krb5_auth_con_getkey: %s ]\r\n",
- krb5_get_err_text(context, ret));
+ print_krb5_error(context, ret, "[ krb5_auth_con_getkey: %s ]\r\n");
auth_send_retry();
return;
}
@@ -632,8 +639,7 @@
ret = krb5_rd_rep(context, auth_context, &inbuf, &reply);
if (ret) {
- printf("[ Mutual authentication failed: %s ]\r\n",
- krb5_get_err_text (context, ret));
+ print_krb5_error(context, ret, "[ Mutual authentication failed: %s ]\r\n");
auth_send_retry();
return;
}
@@ -748,8 +754,7 @@
ret = krb5_cc_default (context, &ccache);
if (ret) {
if (auth_debug_mode)
- printf ("KerberosV5: could not get default ccache: %s\r\n",
- krb5_get_err_text (context, ret));
+ print_krb5_error(context, ret, "KerberosV5: could not get default ccache: %s\r\n");
return;
}
@@ -756,8 +761,7 @@
ret = krb5_cc_get_principal (context, ccache, &principal);
if (ret) {
if (auth_debug_mode)
- printf ("KerberosV5: could not get principal: %s\r\n",
- krb5_get_err_text (context, ret));
+ print_krb5_error(context, ret, "KerberosV5: could not get principal: %s\r\n");
return;
}
@@ -775,8 +779,7 @@
if (ret) {
if (auth_debug_mode)
- printf ("KerberosV5: could not get principal: %s\r\n",
- krb5_get_err_text (context, ret));
+ print_krb5_error(context, ret, "KerberosV5: could not get principal: %s\r\n");
return;
}
@@ -796,8 +799,7 @@
&out_data);
if (ret) {
if (auth_debug_mode)
- printf ("Kerberos V5: error getting forwarded creds: %s\r\n",
- krb5_get_err_text (context, ret));
+ print_krb5_error(context, ret, "Kerberos V5: error getting forwarded creds: %s\r\n");
return;
}
Modified: trunk/contrib/telnet/libtelnet/key-proto.h
===================================================================
--- trunk/contrib/telnet/libtelnet/key-proto.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/key-proto.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -52,7 +52,7 @@
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/libtelnet/key-proto.h 87139 2001-11-30 21:06:38Z markm $
*/
#ifndef __KEY_PROTO__
Modified: trunk/contrib/telnet/libtelnet/krb4encpwd.c
===================================================================
--- trunk/contrib/telnet/libtelnet/krb4encpwd.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/krb4encpwd.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/krb4encpwd.c 87155 2001-11-30 22:28:07Z markm $");
#ifndef lint
static char sccsid[] = "@(#)krb4encpwd.c 8.3 (Berkeley) 5/30/95";
Modified: trunk/contrib/telnet/libtelnet/misc-proto.h
===================================================================
--- trunk/contrib/telnet/libtelnet/misc-proto.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/misc-proto.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)misc-proto.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/libtelnet/misc-proto.h 87155 2001-11-30 22:28:07Z markm $
*/
/*
Modified: trunk/contrib/telnet/libtelnet/misc.c
===================================================================
--- trunk/contrib/telnet/libtelnet/misc.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/misc.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/misc.c 98882 2002-06-26 17:05:08Z markm $");
#ifndef lint
#if 0
Modified: trunk/contrib/telnet/libtelnet/pk.c
===================================================================
--- trunk/contrib/telnet/libtelnet/pk.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/pk.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/pk.c 189092 2009-02-26 21:43:15Z ed $");
/* public key routines */
/* functions:
Modified: trunk/contrib/telnet/libtelnet/pk.h
===================================================================
--- trunk/contrib/telnet/libtelnet/pk.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/pk.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/libtelnet/pk.h 87139 2001-11-30 21:06:38Z markm $
*/
/* header for the des routines that we will use */
Modified: trunk/contrib/telnet/libtelnet/read_password.c
===================================================================
--- trunk/contrib/telnet/libtelnet/read_password.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/read_password.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/read_password.c 87139 2001-11-30 21:06:38Z markm $");
#ifndef lint
#if 0
@@ -42,8 +42,8 @@
#endif /* not lint */
/*
- * $Source: /home/cvs/src/contrib/telnet/libtelnet/read_password.c,v $
- * $Author: laffer1 $
+ * $Source: /mit/kerberos/src/lib/des/RCS/read_password.c,v $
+ * $Author: jon $
*
* Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
* of Technology.
Modified: trunk/contrib/telnet/libtelnet/rsaencpwd.c
===================================================================
--- trunk/contrib/telnet/libtelnet/rsaencpwd.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/rsaencpwd.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/rsaencpwd.c 87139 2001-11-30 21:06:38Z markm $");
#ifndef lint
static char sccsid[] = "@(#)rsaencpwd.c 8.3 (Berkeley) 5/30/95";
Modified: trunk/contrib/telnet/libtelnet/sra.c
===================================================================
--- trunk/contrib/telnet/libtelnet/sra.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/libtelnet/sra.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/libtelnet/sra.c 228559 2011-12-16 00:48:53Z dim $");
#ifdef SRA
#ifdef ENCRYPTION
Modified: trunk/contrib/telnet/telnet/authenc.c
===================================================================
--- trunk/contrib/telnet/telnet/authenc.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/authenc.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/telnet/authenc.c 114630 2003-05-04 02:54:49Z obrien $");
#ifdef AUTHENTICATION
#ifdef ENCRYPTION
Modified: trunk/contrib/telnet/telnet/commands.c
===================================================================
--- trunk/contrib/telnet/telnet/commands.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/commands.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/telnet/commands.c 275508 2014-12-05 12:23:29Z ngie $");
#include <sys/param.h>
#include <sys/un.h>
@@ -896,6 +896,7 @@
{ "forw1", "alternate end of line character", NULL, termForw1Charp },
{ "forw2", "alternate end of line character", NULL, termForw2Charp },
{ "ayt", "alternate AYT character", NULL, termAytCharp },
+ { "baudrate", "set remote baud rate", DoBaudRate, ComPortBaudRate },
{ NULL, NULL, NULL, NULL }
};
Modified: trunk/contrib/telnet/telnet/defines.h
===================================================================
--- trunk/contrib/telnet/telnet/defines.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/defines.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)defines.h 8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/telnet/defines.h 87139 2001-11-30 21:06:38Z markm $
*/
#define settimer(x) clocks.x = clocks.system++
Modified: trunk/contrib/telnet/telnet/externs.h
===================================================================
--- trunk/contrib/telnet/telnet/externs.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/externs.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)externs.h 8.3 (Berkeley) 5/30/95
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/telnet/externs.h 275508 2014-12-05 12:23:29Z ngie $
*/
#ifndef BSD
@@ -231,6 +231,10 @@
NetTraceFile[]; /* Name of file where debugging output goes */
extern void
SetNetTrace(char *); /* Function to change where debugging goes */
+extern unsigned char
+ ComPortBaudRate[]; /* Baud rate of the remote end */
+extern void
+ DoBaudRate(char *); /* Function to set the baud rate of the remote end */
extern jmp_buf
toplevel; /* For error conditions. */
@@ -475,7 +479,17 @@
# endif
#endif
+typedef struct {
+ int
+ system, /* what the current time is */
+ echotoggle, /* last time user entered echo character */
+ modenegotiated, /* last time operating mode negotiated */
+ didnetreceive, /* last time we read data from network */
+ gotDM; /* when did we last see a data mark */
+} Clocks;
+extern Clocks clocks;
+
/* Ring buffer structures which are shared */
extern Ring
Modified: trunk/contrib/telnet/telnet/main.c
===================================================================
--- trunk/contrib/telnet/telnet/main.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/main.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/telnet/main.c 275508 2014-12-05 12:23:29Z ngie $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -91,10 +91,10 @@
fprintf(stderr, "usage: %s %s%s%s%s\n",
prompt,
#ifdef AUTHENTICATION
- "[-4] [-6] [-8] [-E] [-K] [-L] [-N] [-S tos] [-X atype] [-c] [-d]",
- "\n\t[-e char] [-k realm] [-l user] [-f/-F] [-n tracefile] ",
+ "[-4] [-6] [-8] [-B baudrate] [-E] [-K] [-L] [-N] [-S tos] [-X atype]",
+ "\n\t[-c] [-d] [-e char] [-k realm] [-l user] [-f/-F] [-n tracefile] ",
#else
- "[-4] [-6] [-8] [-E] [-L] [-N] [-S tos] [-c] [-d]",
+ "[-4] [-6] [-8] [-B baudrate] [-E] [-L] [-N] [-S tos] [-c] [-d]",
"\n\t[-e char] [-l user] [-n tracefile] ",
#endif
"[-r] [-s src_addr] [-u] ",
@@ -154,7 +154,7 @@
#define IPSECOPT
#endif
while ((ch = getopt(argc, argv,
- "468EKLNS:X:acde:fFk:l:n:rs:uxy" IPSECOPT)) != -1)
+ "468B:EKLNS:X:acde:fFk:l:n:rs:uxy" IPSECOPT)) != -1)
#undef IPSECOPT
{
switch(ch) {
@@ -169,6 +169,9 @@
case '8':
eight = 3; /* binary output and input */
break;
+ case 'B':
+ DoBaudRate(optarg);
+ break;
case 'E':
rlogin = escape = _POSIX_VDISABLE;
break;
Modified: trunk/contrib/telnet/telnet/network.c
===================================================================
--- trunk/contrib/telnet/telnet/network.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/network.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/telnet/network.c 207449 2010-04-30 19:52:35Z jilles $");
#include <sys/types.h>
#include <sys/socket.h>
Modified: trunk/contrib/telnet/telnet/ring.c
===================================================================
--- trunk/contrib/telnet/telnet/ring.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/ring.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/telnet/ring.c 114630 2003-05-04 02:54:49Z obrien $");
/*
* This defines a structure for a ring buffer.
Modified: trunk/contrib/telnet/telnet/ring.h
===================================================================
--- trunk/contrib/telnet/telnet/ring.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/ring.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ring.h 8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: stable/10/contrib/telnet/telnet/ring.h 87155 2001-11-30 22:28:07Z markm $
*/
#if defined(P)
Modified: trunk/contrib/telnet/telnet/sys_bsd.c
===================================================================
--- trunk/contrib/telnet/telnet/sys_bsd.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/sys_bsd.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/telnet/sys_bsd.c 275508 2014-12-05 12:23:29Z ngie $");
/*
* The following routines try to encapsulate what is system dependent
@@ -60,6 +60,7 @@
#include "defines.h"
#include "externs.h"
#include "types.h"
+#include "baud.h"
int
tout, /* Output file descriptor */
@@ -682,71 +683,6 @@
}
-/*
- * Try to guess whether speeds are "encoded" (4.2BSD) or just numeric (4.4BSD).
- */
-#if B4800 != 4800
-#define DECODE_BAUD
-#endif
-
-#ifdef DECODE_BAUD
-#ifndef B7200
-#define B7200 B4800
-#endif
-
-#ifndef B14400
-#define B14400 B9600
-#endif
-
-#ifndef B19200
-# define B19200 B14400
-#endif
-
-#ifndef B28800
-#define B28800 B19200
-#endif
-
-#ifndef B38400
-# define B38400 B28800
-#endif
-
-#ifndef B57600
-#define B57600 B38400
-#endif
-
-#ifndef B76800
-#define B76800 B57600
-#endif
-
-#ifndef B115200
-#define B115200 B76800
-#endif
-
-#ifndef B230400
-#define B230400 B115200
-#endif
-
-
-/*
- * This code assumes that the values B0, B50, B75...
- * are in ascending order. They do not have to be
- * contiguous.
- */
-struct termspeeds {
- long speed;
- long value;
-} termspeeds[] = {
- { 0, B0 }, { 50, B50 }, { 75, B75 },
- { 110, B110 }, { 134, B134 }, { 150, B150 },
- { 200, B200 }, { 300, B300 }, { 600, B600 },
- { 1200, B1200 }, { 1800, B1800 }, { 2400, B2400 },
- { 4800, B4800 }, { 7200, B7200 }, { 9600, B9600 },
- { 14400, B14400 }, { 19200, B19200 }, { 28800, B28800 },
- { 38400, B38400 }, { 57600, B57600 }, { 115200, B115200 },
- { 230400, B230400 }, { -1, B230400 }
-};
-#endif /* DECODE_BAUD */
-
void
TerminalSpeeds(long *ispeed, long *ospeed)
{
Modified: trunk/contrib/telnet/telnet/telnet.1
===================================================================
--- trunk/contrib/telnet/telnet/telnet.1 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/telnet.1 2015-07-28 01:15:21 UTC (rev 7183)
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)telnet.1 8.6 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/contrib/telnet/telnet/telnet.1 275508 2014-12-05 12:23:29Z ngie $
.\"
.Dd September 18, 2006
.Dt TELNET 1
@@ -43,6 +43,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl 468EFKLNacdfruxy
+.Op Fl B Ar baudrate
.Op Fl S Ar tos
.Op Fl X Ar authtype
.Op Fl e Ar escapechar
@@ -89,6 +90,9 @@
negotiate the
.Dv TELNET BINARY
option on both input and output.
+.It Fl B Ar baudrate
+Sets the baud rate to
+.Ar baudrate .
.It Fl E
Stops any character from being recognized as an escape character.
.It Fl F
@@ -344,7 +348,6 @@
and
.Ic display
commands).
-.Pp
.Bl -tag -width "mode type"
.It Ic auth Ar argument ...
The auth command manipulates the information sent through the
@@ -664,7 +667,6 @@
Sends one or more special character sequences to the remote host.
The following are the arguments which may be specified
(more than one argument may be specified at a time):
-.Pp
.Bl -tag -width escape
.It Ic abort
Sends the
Modified: trunk/contrib/telnet/telnet/telnet.c
===================================================================
--- trunk/contrib/telnet/telnet/telnet.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/telnet.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/telnet/telnet.c 275508 2014-12-05 12:23:29Z ngie $");
#include <sys/types.h>
@@ -52,6 +52,7 @@
#include <stdlib.h>
#include <term.h>
#include <unistd.h>
+#include <arpa/inet.h>
#include <arpa/telnet.h>
#include "ring.h"
@@ -68,7 +69,7 @@
#include <libtelnet/encrypt.h>
#endif
#include <libtelnet/misc.h>
-
+
#define strip(x) ((my_want_state_is_wont(TELOPT_BINARY)) ? ((x)&0x7f) : (x))
static unsigned char subbuffer[SUBBUFSIZE],
@@ -162,7 +163,7 @@
*/
Clocks clocks;
-
+
/*
* Initialize telnet environment.
*/
@@ -196,8 +197,8 @@
flushline = 1;
telrcv_state = TS_DATA;
}
-
+
/*
* These routines are in charge of sending option negotiations
* to the other side.
@@ -206,7 +207,43 @@
* is in disagreement as to what the current state should be.
*/
+unsigned char ComPortBaudRate[256];
+
void
+DoBaudRate(char *arg)
+{
+ char *temp, temp2[10];
+ int i;
+ uint32_t baudrate;
+
+ errno = 0;
+ baudrate = (uint32_t)strtol(arg, &temp, 10);
+ if (temp[0] != '\0' || (baudrate == 0 && errno != 0))
+ ExitString("Invalid baud rate provided.\n", 1);
+
+ for (i = 1; termspeeds[i].speed != -1; i++)
+ if (baudrate == termspeeds[i].speed)
+ break;
+ if (termspeeds[i].speed == -1)
+ ExitString("Invalid baud rate provided.\n", 1);
+
+ strlcpy(ComPortBaudRate, arg, sizeof(ComPortBaudRate));
+
+ if (NETROOM() < sizeof(temp2)) {
+ ExitString("No room in buffer for baud rate.\n", 1);
+ /* NOTREACHED */
+ }
+
+ snprintf(temp2, sizeof(temp2), "%c%c%c%c....%c%c", IAC, SB, TELOPT_COMPORT,
+ COMPORT_SET_BAUDRATE, IAC, SE);
+
+ baudrate = htonl(baudrate);
+ memcpy(&temp2[4], &baudrate, sizeof(baudrate));
+ ring_supply_data(&netoring, temp2, sizeof(temp2));
+ printsub('>', &temp[2], sizeof(temp2) - 2);
+}
+
+void
send_do(int c, int init)
{
if (init) {
@@ -1084,8 +1121,8 @@
setconnmode(0); /* set changed mode */
}
-
+
/*
* slc()
* Handle special character suboption of LINEMODE.
@@ -1628,8 +1665,8 @@
}
}
-
+
int
telrcv(void)
{
@@ -2013,7 +2050,7 @@
ring_consumed(&ttyiring, count);
return returnValue||count; /* Non-zero if we did anything */
}
-
+
/*
* Scheduler()
*
Modified: trunk/contrib/telnet/telnet/terminal.c
===================================================================
--- trunk/contrib/telnet/telnet/terminal.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/terminal.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/telnet/terminal.c 207449 2010-04-30 19:52:35Z jilles $");
#include <arpa/telnet.h>
#include <sys/types.h>
Modified: trunk/contrib/telnet/telnet/types.h
===================================================================
--- trunk/contrib/telnet/telnet/types.h 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/types.h 2015-07-28 01:15:21 UTC (rev 7183)
@@ -40,13 +40,9 @@
extern Modelist modelist[];
-typedef struct {
- int
- system, /* what the current time is */
- echotoggle, /* last time user entered echo character */
- modenegotiated, /* last time operating mode negotiated */
- didnetreceive, /* last time we read data from network */
- gotDM; /* when did we last see a data mark */
-} Clocks;
+struct termspeeds {
+ int speed;
+ int value;
+};
-extern Clocks clocks;
+extern struct termspeeds termspeeds[];
Modified: trunk/contrib/telnet/telnet/utilities.c
===================================================================
--- trunk/contrib/telnet/telnet/utilities.c 2015-07-28 01:14:43 UTC (rev 7182)
+++ trunk/contrib/telnet/telnet/utilities.c 2015-07-28 01:15:21 UTC (rev 7183)
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/telnet/telnet/utilities.c 228651 2011-12-17 18:18:36Z dim $");
#define TELOPTS
#define TELCMDS
More information about the Midnightbsd-cvs
mailing list