Copy stable/9 to releng/9.3 as part of the 9.3-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by: re (implicit)

Build usr.bin/ with WARNS=6 by default.

Also add some missing $FreeBSD$ to keep svn happy.

Fix conflicts after heimdal-1.1 import and add build infrastructure. Import
all non-style changes made by heimdal to our own libgssapi.

Remove the -DFAST_IPSEC from Makefiles again.

This was needed during the IPSEC->FAST_IPSEC->IPSEC transition
period to not break the build after picking up netipsec header
files. Now that the FAST_IPSEC kernel option is gone and the
default is IPSEC again those defines are superfluous.

Approved by: re (rwatson)

Commit IPv6 support for FAST_IPSEC to the tree.
This commit includes all remaining changes for the time being including
user space updates.

Submitted by: bz
Approved by: re

Stop enforcing dependencies between MK_* options at Makefile level.
All the dependencies are satisfied now in <bsd.own.mk>.

Respect MK_INET6_SUPPORT.
Move INET6 out of the RELEASE_CRUNCH conditional block
because it saves as little as 2% of the binary size and
IPv6 is rather popular today. (Some other binaries, e.g.,
telnetd, include INET6 for RELEASE_CRUNCH already.)

Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)

Remove kludges intended to support src trees with partial obj trees.

Discussed with: ru

NOCRYPT -> NO_CRYPT

Join the 21st century: Cryptography is no longer an optional component
of releases. The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

Approved by: re (scottl), markm
Discussed on: freebsd-current, in late April 2004

Make sure that a "make release" (more accurately the bit that makes
the crunched binary) get a non-cryptographic telnet. This is overkill
in that it covers stuff that is not normally used in a crunched binary.

Ensure that for the cryptographic instances of *telnet*, the "crypto"
distribution is used. This only affects release-building.

Test correct macro for "without crypto" option(s).

Very big makeover in the way telnet, telnetd and libtelnet are built.

Previously, there were two copies of telnet; a non-crypto version
that lived in the usual places, and a crypto version that lived in
crypto/telnet/. The latter was built in a broken manner somewhat akin
to other "contribified" sources. This meant that there were 4 telnets
competing with each other at build time - KerberosIV, Kerberos5,
plain-old-secure and base. KerberosIV is no longer in the running, but
the other three took it in turns to jump all over each other during a
"make buildworld".

As the crypto issue has been clarified, and crypto _calls_ are not
a problem, crypto/telnet has been repo-copied to contrib/telnet,
and with this commit, all telnets are now "contribified". The contrib
path was chosen to not destroy history in the repository, and differs
from other contrib/ entries in that it may be worked on as "normal"
BSD code. There is no dangerous crypto in these sources, only a
very weak system less strong than enigma(1).

Kerberos5 telnet and Secure telnet are now selected by using the usual
macros in /etc/make.conf, and the build process is unsurprising and
less treacherous.

Mrege from crypto telnet with "make unifdef". This gets a bunch of
$FreeBSD$ tags and some debug variable safety belts.

Diff-reduction WRT crypto telnet; replace "#if 0" code removed by an
earlier invocation of unifdef(1).

english(4) police.

Be more careful when parsing arguments.

PR: 45476
MFC after: 5 days

Remove some #if 0'd code. After this, a "make unifdef" here produces
no changes (against crypto telnet).

Reviewed by: MD5

Merge from crypto telnet: permit the argument to -s to be a hostname.

Unifdef(1) the crypto telnet sources.

Replace various spelling with FALLTHROUGH which is lint()able

Typo fixo: imbedded => embedded

Usage style sweep: spell "usage" with a small 'u'.
Also change one case of blatant __progname abuse (several more remain)
This commit does not touch anything in src/{contrib,crypto,gnu}/.

Use `The .Nm utility'

Remove WARNS?=2 and -Wall. WARNS?=2 is going to be the default.

Don't assume that the number of fds to select on is known quantity (in
this case 16). Use dynamic FD_SETs and calculated high-water marks
throughout.
Obtained from: OpenBSD and Apple's Radar database
MFC after: 2 days

Merge from crypto/telnet/telnet/commands.c. Add the necessary paths to
the kerberos libraries and includes.

Merge from master (crypto) telnet. WARNS fixes for alpha.

Merge the (in)complete ANSIfication work from src/crypto/telnet.

After running "make unifdef", commit the result. This code is now
a complete subset of the crypto (master) code.

Diff-reduce WRT src/secure/*telnet*/Makefile.

Also, add an "unifdef:" target, so that the telnet sources can
be remade from the crypto sources in src/crypto/telnet.

Use strlcpy(3) instead of strcpy(3) to copy optarg into a fixed-size buffer.

MFC after: 2 weeks

Manually unifdef(1) CRAY, UNICOS, hpux and sun uselsess code.

Code merge and diff reduction between this and crypto telnet.

Also remove useless AUTHENTICATION code. We have never compiled this
here, and it is doubtful that it even works without crypto.

Removal of following export controll related sentences:
o This option is not available outside of the United States and Canada.
o Because of export controls, TELNET ENCRYPT option is not supported outside
of the United States and Canada.

src/crypto/README revision 1.5 commit log says:
> Crypto sources are no longer export controlled:
> Explain, why crypto sources are still in crypto/.
and actually telnet encryption is used outside of US and Canada now.

Pointed out by: OHSAWA Chitoshi <ohsawa@catv1.ccn-net.ne.jp>
Reviewed by:no objection on doc

Remove whitespace at EOL.

mdoc(7) police: removed HISTORY info from the .Os call.

mdoc(7) police: remove extraneous .Pp before and/or after .Sh.

Fix the type of the NULL arg to execl()

Idea from: Theo de Raadt <deraadt@openbsd.org>

mdoc(7) police: moved -u down, fixed markup, removed hard sentence break.

Document -u in the usage().
Make usage fit on a standard 80-column display.

A feature to allow one to telnet to a unix domain socket.

Obtained from: Lyndon Nerenberg <lyndon@orthanc.ab.ca>

libtelnet.a is gone; add a special hack for `make release' fixit floppy.

Bye-bye /usr/lib/libtelnet.a. This should fix ``make release'' brokeness.

Approved by: markm

Do not compile INET6 support if RELEASE_CRUNCH is defined
(used by install floppy/picobsd)

Fix typo: compatability -> compatibility.

Compatability is not an existing english word.

Fix typo: seperate -> separate.

Seperate does not exist in the english language.

Also add $FreeBSD$ to README.

Fix typo: wierd -> weird.

There is no such thing as wierd in the english language.

mdoc(7) police: split punctuation characters + misc fixes.

Prepare for mdoc(7)NG.

Correct definition of MAXHOSTNAMELEN in ifdef'ed code.

Submitted by: Edwin Groothuis <mavetju@chello.nl>
PR: bin/22787

mdoc(7) police: use the new features of the Nm macro.

Fix a buffer overflow from a long local hostname.

Obtained from: OpenBSD

Fix buffer overflow when DISPLAY is longer than 43 characters. This
is not exploitable because telnet doesn't run with elevated privs.

Didn't fix all the other potential buffer overflows. Would be a good
task for someone who has lots of time to carefully study each case
because cut and paste solutions are dangerous for this code base.

Added $FreeBSD$ in the same way that command.c did it.

getopt and friends are declared in <unistd.h>
getopt returns -1 not EOF.

Fix buffer size of ALIGNed buffer.

PR: bin/20053
Submitted by: Alex Kapranoff <alex@kapran.bitmcnit.bryansk.su>

One more EAI_NONAME -> EAI_NODATA issue.

Make telnet -s work. It is corresponding to EAI_NONAME -> EAI_NODATA
change (getaddrinfo.c rev 1.12).

simplify and correct name resolution in tn().
XXX what is the goal of af_switch()? it seems to me it is not necessary
any more with getaddrinfo(3) fix for correct name-resolution ordering.
comments? >shin

Mention about -4 and -6 options.

Fixed misspelling of DPADD as DPADDA.

Fixed some misformattings.

CMSG_XXX macros alignment fixes to follow RFC2292.

Approved by: jkh

Submitted by: Partly from tech@openbsd
Reviewed by: itojun

Use libcrypto in place of libdes.

Use static buffer to save source route hostnames.

Approved by: jkh

Print "Trying ..." for each host. Also cleanups for error printing.

Approved by: jkh

Submitted by: Ben Smithurst <ben@scientia.demon.co.uk>

Fix bugs in telnet.

Sorry there were still several bugs.
-error retry at af missmatch was incomplete.
-af matching for source addr option was wrong
-socket was not freed at retry.

Approved by: jkh

Add more dual stack consideration.

-Should retry as much as possible when some of source
routing intermediate hosts' address families missmatch
happened.
(such as when a host has only A record, and another host
has each of A and AAAA record.)

-Should retry as much as possible when dest addr and
source addr(specified with -s option) address family
missmatch happend

Approved by: jkh

Fix telnet core dump at invalid service name specified.
Added an error check to avoid it.

Approved by: jkh

Submitted by: Robert Muir <rmuir@gibralter.net>

Add NI_NAMEREQD flag to getnameinfo() call. Without this flag,
getnameinfo() don't return error at name resolving failure.
But it is used at doaddrlookup(-N) case in telnet, error need to be
returned to correctly initialize hostname buffer.

Discovered at checking recent KAME repository change, noticed by itojun.

fix breakage of make release.

Confirmed by: German Tischler <tanis@gaspode.franken.de>

another tcp apps IPv6 updates.(should be make world safe)
ftp, telnet, ftpd, faithd
also telnet related sync with crypto, secure, kerberosIV

Obtained from: KAME project

Nearly missed this one. Turn off -DTERMCAP otherwise it defines a bunch
of conflicting symbols with ncurses.

$Id$ -> $FreeBSD$

Document the "skey" command in telnet(1).

PR: docs/12360
Submitted by: kjm@rins.ryukoku.ac.jp (KOJIMA Hajime)

Add "-N" option to the SYNOPSIS and usage().

Add "-s src_addr" option to allow setting of the source IP address.

It was possible to circumvent telnet's security ``-E'' (no escape at all)
option by running it with ``-8 -E'' and passing it 0xff character.

PR: 6317
Reviewed by: des, David Borman <dab@bsdi.com> (the author)

Add "-N" option to supress reverse name lookup.
This comes in really handy when you're telneting the broken DNS server by
IP.

PR: bin/8698

Fixed printf format errors.

#include <arpa/inet.h>

Don't assume that hp->h_lenght == 4. Be conservative in its use.
Submitted by: J. Assange a long time ago.

Remove unneeded crud.

Add #include <stdlib.h> to get prototype for malloc().

Add #include <string.h> to get prototypes.

Fix some minor formatting nits.

PR: 5373
Submitted by: Matthew Hunt <mph@pobox.com>

Correct some anomalies in the man page.

PR: 3808
Parially submitted by: Takeshi MUTOH <mutoh@info.nara-k.ac.jp>

Hardcode progname in usage string.

This commit was generated by cvs2svn to compensate for changes in r27233,
which included commits to RCS files with non-trunk default branches.

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Revert $FreeBSD$ to $Id$

Sort cross references.

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Report the reason why select unexpectedly failed..

Make 'skey' command visible through 'help'

Use -DSKEY instead of wrong -DPATH_SKEY

Import a few relatively minor fixes from current Borman telnet.
Add some buffer overrun fixes from OpenBSD and myself.
Add skey calculator kludge from OpenBSD.

TODO: do a real merge of dab's sources... probably just make telnet and
telnetd contrib software.

Obtained from: OpenBSD, dab@bsdi.com

delete doubled words, e.g.: "the the" -> "the"

Make telnet a synonym for open

Fixed DPADD.

Remove obsolete SOCKSv4 support

Add support for socks

Section SEE ALSO complete

Oh foo. I should a) learn to read. b) learn to think. :-)
Telnet has nothing to do with this, it's telnetd and telnetd
doesn't use KLUDGELINEMODE so that theory is washed up. Anyway,
back out previous commit and slink away with red face.

Remove -DKLUDGELINEMODE again; it's breaking things and Paul T. says
it's a bug anyway.

Use the same DECODE_BAUD trick like in new telnet to set
termios speed
Obtained from: Pre-Lite2 telnet

Remove trailing whitespace.

Use symbolic "IPTOS_LOWDELAY" instead of octal bit value for this socket
option. The bit value was wrong.

Fix big f*ckup by doing "make nocrypt"
(Don't think I don't realize what a big f*ckup this was.)
Submitted by: geoff.

Don't do Kerberos yet, we aren't ready for it.

This commit was generated by cvs2svn to compensate for changes in r1590,
which included commits to RCS files with non-trunk default branches.