=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/telnet.1,v retrieving revision 1.49 retrieving revision 1.50 diff -c -r1.49 -r1.50 *** src/usr.bin/telnet/telnet.1 2014/05/09 06:37:38 1.49 --- src/usr.bin/telnet/telnet.1 2014/07/19 23:50:38 1.50 *************** *** 1,4 **** ! .\" $OpenBSD: telnet.1,v 1.49 2014/05/09 06:37:38 jmc Exp $ .\" $NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $ .\" .\" Copyright (c) 1983, 1990, 1993 --- 1,4 ---- ! .\" $OpenBSD: telnet.1,v 1.50 2014/07/19 23:50:38 guenther Exp $ .\" $NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $ .\" .\" Copyright (c) 1983, 1990, 1993 *************** *** 30,36 **** .\" .\" from: @(#)telnet.1 8.4 (Berkeley) 2/3/94 .\" ! .Dd $Mdocdate: May 9 2014 $ .Dt TELNET 1 .Os .Sh NAME --- 30,36 ---- .\" .\" from: @(#)telnet.1 8.4 (Berkeley) 2/3/94 .\" ! .Dd $Mdocdate: July 19 2014 $ .Dt TELNET 1 .Os .Sh NAME *************** *** 39,52 **** .Sh SYNOPSIS .Nm telnet .Bk -words ! .Op Fl 468acdEFfKLrx .Op Fl b Ar hostalias .Op Fl e Ar escapechar - .Op Fl k Ar realm .Op Fl l Ar user .Op Fl n Ar tracefile .Op Fl V Ar rtable - .Op Fl X Ar authtype .Oo .Ar host .Op Ar port --- 39,50 ---- .Sh SYNOPSIS .Nm telnet .Bk -words ! .Op Fl 4678acDdEKLr .Op Fl b Ar hostalias .Op Fl e Ar escapechar .Op Fl l Ar user .Op Fl n Ar tracefile .Op Fl V Ar rtable .Oo .Ar host .Op Ar port *************** *** 79,87 **** Forces .Nm to use IPv6 addresses only. .It Fl 8 Specifies an 8-bit data path. ! This causes an attempt to negotiate the .Dv TELNET BINARY option on both input and output. .It Fl a --- 77,90 ---- Forces .Nm to use IPv6 addresses only. + .It Fl 7 + Specifies a 7-bit data path. + This attempts to disable the + .Dv TELNET BINARY + option on both input and output. .It Fl 8 Specifies an 8-bit data path. ! This attempts to negotiate the .Dv TELNET BINARY option on both input and output. .It Fl a *************** *** 114,119 **** --- 117,130 ---- (See the .Ic toggle skiprc command on this man page.) + .It Fl D + Disables rewriting of the + .Ev DISPLAY + variable when it starts with + .Sq :\& + or + .Sq unix: . + By default, these are replaced with the local hostname and a colon. .It Fl d Sets the initial value of the .Ic debug *************** *** 130,159 **** .Ar escapechar is omitted, then there will be no escape character. - .It Fl F - If Kerberos authentication is being used, the - .Fl F - option allows the local credentials to be forwarded - to the remote system, including any credentials that - have already been forwarded into the local environment. - .It Fl f - If Kerberos authentication is being used, the - .Fl f - option allows the local credentials to be forwarded to the remote system. .It Fl K Specifies no automatic login to the remote system. - .It Fl k Ar realm - If Kerberos authentication is being used, the - .Fl k - option requests that - .Nm - obtain tickets for the remote host in - realm - .Ar realm - instead of the remote host's realm. .It Fl L Specifies an 8-bit data path on output. ! This causes the BINARY option to be negotiated on output. .It Fl l Ar user When connecting to the remote system, if the remote system understands the --- 141,153 ---- .Ar escapechar is omitted, then there will be no escape character. .It Fl K Specifies no automatic login to the remote system. .It Fl L Specifies an 8-bit data path on output. ! This attempts to negotiate the ! .Dv TELNET BINARY ! option on output. .It Fl l Ar user When connecting to the remote system, if the remote system understands the *************** *** 184,199 **** option. .It Fl V Ar rtable Set the routing table to be used. - .It Fl X Ar authtype - Disables the - .Ar authtype - type of authentication. - .It Fl x - Turn on encryption of the data stream. - When this option is turned on, - .Nm - will exit with an error if authentication cannot be negotiated or if - encryption cannot be turned on. .It Ar host Indicates the official name, an alias, or the Internet address of a remote host. --- 178,183 ---- *************** *** 315,348 **** .Ic display commands). .Bl -tag -width "mode type" - .It Ic auth Ar argument ... - The - .Ic auth - command manipulates the information sent through the - .Dv TELNET AUTHENTICATE - option. - Valid arguments for the - .Ic auth - command are as follows: - .Bl -tag -width "disable type" - .It Ic disable Ar type - Disables the specified - .Ar type - of authentication. - To obtain a list of available types, use the - .Ic auth disable ?\& - command. - .It Ic enable Ar type - Enables the specified - .Ar type - of authentication. - To obtain a list of available types, use the - .Ic auth enable ?\& - command. - .It Ic status - Lists the current status of the various types of - authentication. - .El .It Ic close Close a TELNET session and return to command mode. .It Ic display Ar argument ... --- 299,304 ---- *************** *** 351,434 **** and .Ic toggle values (see below). - .It Ic encrypt Ar argument ... - The - .Ic encrypt - command manipulates the information sent through the - .Dv TELNET ENCRYPT - option that's available when Kerberos is used. - .Pp - Valid arguments for the encrypt command are as follows: - .Bl -tag -width Ar - .It Ic disable Ar type Ic [input|output] - Disables the specified - .Ar type - of encryption. - If you omit - .Ic input - and - .Ic output , - both input and output - are disabled. - To obtain a list of available types, use the - .Ic encrypt disable ?\& - command. - .It Ic enable Ar type Ic [input|output] - Enables the specified - .Ar type - of encryption. - If you omit - .Ic input - and - .Ic output , - both input and output are - enabled. - To obtain a list of available types, use the - .Ic encrypt enable ?\& - command. - .It Ic input - This is the same as the - .Ic encrypt start input - command. - .It Ic -input - This is the same as the - .Ic encrypt stop input - command. - .It Ic output - This is the same as the - .Ic encrypt start output - command. - .It Ic -output - This is the same as the - .Ic encrypt stop output - command. - .It Ic start Ic [input|output] - Attempts to start encryption. - If you omit - .Ic input - and - .Ic output , - both input and output are enabled. - To obtain a list of available types, use the - .Ic encrypt enable ?\& - command. - .It Ic status - Lists the current status of encryption. - .It Ic stop Ic [input|output] - Stops encryption. - If you omit - .Ic input - and - .Ic output , - encryption is on both input and output. - .It Ic type Ar type - Sets the default type of encryption to be used - with later - .Ic encrypt start - or - .Ic encrypt stop - commands. - .El .It Ic environ Ar argument ... The .Ic environ --- 307,312 ---- *************** *** 568,573 **** --- 446,453 ---- .El .It Xo .Ic open Ar host + .Op Fl a + .Op Fl b hostalias .Op Fl l Ar user .Oo Op Fl .Ar port Oc *************** *** 582,592 **** or an Internet address specified in the ``dot notation'' (see .Xr inet_ntop 3 ) . The .Fl l ! option may be used to specify the user name ! to be passed to the remote system via the ! .Ev ENVIRON ! option. When connecting to a non-standard port, .Nm omits any automatic initiation of TELNET options. --- 462,473 ---- or an Internet address specified in the ``dot notation'' (see .Xr inet_ntop 3 ) . The + .Fl a , + .Fl b , + and .Fl l ! options are equivalent to the identical command line options, ! but only apply to the new telnet connection being opened. When connecting to a non-standard port, .Nm omits any automatic initiation of TELNET options. *************** *** 1177,1184 **** command. Valid arguments are: .Bl -tag -width Ar - .It Ic authdebug - Turns on debugging information for the authentication code. .It Ic autoflush If .Ic autoflush --- 1058,1063 ---- *************** *** 1206,1230 **** .Dv FALSE (see .Xr stty 1 ) . - .It Ic autodecrypt - When the - .Dv TELNET ENCRYPT - option is negotiated, by - default the actual encryption (decryption) of the data - stream does not start automatically. - The - .Ic autoencrypt - .Pq Ic autodecrypt - command states that encryption of the - output (input) stream should be enabled as soon as - possible. .It Ic autologin ! If the remote side supports the ! .Dv TELNET AUTHENTICATION ! option TELNET attempts to use it to perform automatic authentication. ! If the ! .Dv AUTHENTICATION ! option is not supported, the user's login name is propagated through the .Dv TELNET ENVIRON option. --- 1085,1092 ---- .Dv FALSE (see .Xr stty 1 ) . .It Ic autologin ! The user's login name is propagated through the .Dv TELNET ENVIRON option. *************** *** 1298,1305 **** Toggles socket level debugging (useful only to the superuser). The initial value for this toggle is .Dv FALSE . - .It Ic encdebug - Turns on debugging information for the encryption code. .It Ic localchars If this is .Dv TRUE , --- 1160,1165 ----