Module Name:	basesrc
Committed By:	thorpej
Date:		Thu Jun 22 07:09:06 UTC 2000

Modified Files:
	basesrc/lib/libtelnet [netbsd-1-5]: Makefile auth.c encrypt.c encrypt.h
	    misc.c
	basesrc/libexec/telnetd [netbsd-1-5]: Makefile authenc.c ext.h state.c
	    telnetd.c termstat.c utility.c
	basesrc/usr.bin/telnet [netbsd-1-5]: Makefile authenc.c commands.c
	    externs.h main.c network.c ring.c ring.h telnet.c terminal.c
	    utilities.c
Added Files:
	basesrc/lib/libtelnet [netbsd-1-5]: enc-proto.h enc_des.c forward.c
	    kerberos.c kerberos5.c key-proto.h krb4encpwd.c spx.c

Log Message:
Update from trunk:
Bring the telnet situation back into better shape.  Specifically,
pull in just about all of the differences from the crypto-us telnet
suite (which includes Kerberos 4 and connection encryption support).
Also bring in the Kerberos 5 support from the Heimdal telnet, and
frob a little so that it can work with the non-Heimdal telnet suite.

There is still some work left to do, specifically:
- Add Heimdal's ticket forwarding support to the Berkeley Kerberos 4
  module.
- Add connection encryption support to the Heimdal Kerberos 5
  module.  Hints on this can be taken from the MIT Kerberos 5
  module which still exists in crypto-us.

However, even with the shortcomings listed above, this is a
better situation than using the stock Heimdal telnet suite,
which does not understand the IPSec policy stuff, and is also
based on much older code which contains bugs that we have already
fixed in the NetBSD sources.


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.10.2.1 basesrc/lib/libtelnet/Makefile
cvs rdiff -r1.10 -r1.10.4.1 basesrc/lib/libtelnet/auth.c
cvs rdiff -r0 -r1.4.2.1 basesrc/lib/libtelnet/enc-proto.h \
    basesrc/lib/libtelnet/enc_des.c basesrc/lib/libtelnet/kerberos.c \
    basesrc/lib/libtelnet/kerberos5.c basesrc/lib/libtelnet/key-proto.h
cvs rdiff -r1.6 -r1.6.10.1 basesrc/lib/libtelnet/encrypt.c
cvs rdiff -r1.5 -r1.5.10.1 basesrc/lib/libtelnet/encrypt.h
cvs rdiff -r0 -r1.1.2.1 basesrc/lib/libtelnet/forward.c \
    basesrc/lib/libtelnet/krb4encpwd.c basesrc/lib/libtelnet/spx.c
cvs rdiff -r1.9 -r1.9.4.1 basesrc/lib/libtelnet/misc.c
cvs rdiff -r1.23 -r1.23.2.1 basesrc/libexec/telnetd/Makefile
cvs rdiff -r1.6 -r1.6.4.1 basesrc/libexec/telnetd/authenc.c
cvs rdiff -r1.10 -r1.10.4.1 basesrc/libexec/telnetd/ext.h
cvs rdiff -r1.11 -r1.11.12.1 basesrc/libexec/telnetd/state.c
cvs rdiff -r1.20 -r1.20.4.1 basesrc/libexec/telnetd/telnetd.c
cvs rdiff -r1.6 -r1.6.12.1 basesrc/libexec/telnetd/termstat.c
cvs rdiff -r1.13 -r1.13.4.1 basesrc/libexec/telnetd/utility.c
cvs rdiff -r1.20 -r1.20.2.1 basesrc/usr.bin/telnet/Makefile
cvs rdiff -r1.8 -r1.8.4.1 basesrc/usr.bin/telnet/authenc.c
cvs rdiff -r1.42 -r1.42.4.1 basesrc/usr.bin/telnet/commands.c
cvs rdiff -r1.18 -r1.18.4.1 basesrc/usr.bin/telnet/externs.h
cvs rdiff -r1.12 -r1.12.4.1 basesrc/usr.bin/telnet/main.c
cvs rdiff -r1.6 -r1.6.10.1 basesrc/usr.bin/telnet/network.c \
    basesrc/usr.bin/telnet/terminal.c
cvs rdiff -r1.8 -r1.8.10.1 basesrc/usr.bin/telnet/ring.c
cvs rdiff -r1.7 -r1.7.10.1 basesrc/usr.bin/telnet/ring.h \
    basesrc/usr.bin/telnet/utilities.c
cvs rdiff -r1.15 -r1.15.4.1 basesrc/usr.bin/telnet/telnet.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.