diff options
| author | markm <markm@FreeBSD.org> | 2003-07-16 20:59:15 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2003-07-16 20:59:15 +0000 |
| commit | d6aec2b6d60b4b7b11a4a51d8a87a963e942803c (patch) | |
| tree | d0941cea5c5d555255e1721af0d195e7b1148f6a /secure/libexec | |
| parent | 23022fa9406006dadd2eafdf36b94c737d737135 (diff) | |
| download | FreeBSD-src-d6aec2b6d60b4b7b11a4a51d8a87a963e942803c.zip FreeBSD-src-d6aec2b6d60b4b7b11a4a51d8a87a963e942803c.tar.gz | |
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.
Diffstat (limited to 'secure/libexec')
| -rw-r--r-- | secure/libexec/Makefile | 3 | ||||
| -rw-r--r-- | secure/libexec/telnetd/Makefile | 26 |
2 files changed, 0 insertions, 29 deletions
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index 56d09b7..b60b4ce 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -5,9 +5,6 @@ SUBDIR= .if !defined(NO_OPENSSH) SUBDIR+=sftp-server ssh-keysign .endif -.if defined(NO_KERBEROS) -SUBDIR+=telnetd -.endif .endif .include <bsd.subdir.mk> diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile deleted file mode 100644 index 07378fd6..0000000 --- a/secure/libexec/telnetd/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $FreeBSD$ - -# Do not define -DKLUDGELINEMODE, as it does not interact well with many -# telnet implementations. - -PROG= telnetd -MAN= telnetd.8 - -SRCS= global.c slc.c state.c sys_term.c telnetd.c \ - termstat.c utility.c authenc.c - -CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ - -DENV_HACK -DAUTHENTICATION -DENCRYPTION \ - -I${TELNETDIR} -DINET6 - -WARNS?= 2 -WFORMAT?= 0 - -DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBPAM} -LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ - -lcrypt ${MINUSLPAM} - -.include <bsd.prog.mk> - -.PATH: ${TELNETDIR}/telnetd |
