Revamp and diff-reduce the various secure telnets. Make sure that

Kerberos5 has _a_ telnet (which is not currently K5 enabled).
Incorporate BDE's static linking fixes.

7 files changed, 30 insertions, 20 deletions

diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index bf86f38..a72ef17 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -10,6 +10,7 @@ INCLUDEDIR=	${.CURDIR}/../../include
 KRB4DIR=	${.CURDIR}/../../../crypto/kerberosIV
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 ROKENDIR=	${.CURDIR}/../../lib/libroken
+TELNETDIR=	${.CURDIR}/../../../crypto/telnet
 
 CFLAGS+=-Wall -I${INCLUDEDIR} -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
 
@@ -98,6 +99,12 @@ SLOBJDIR=	${.OBJDIR}/../../lib/libsl
 SLOBJDIR=	${.CURDIR}/../../lib/libsl
 .endif
 
+.if exists(${.OBJDIR}/../../lib/libtelnet)
+LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
+.else
+LIBTELNET=	${.CURDIR}/../../lib/libtelnet/libtelnet.a
+.endif
+
 COMPILE_ET=     compile_et
 
 .ORDER: asn1_err.c asn1_err.h
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index c8bf769..c0d5cab 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -5,4 +5,5 @@ SUBDIR=	libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl l
 	(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
 SUBDIR+=libkafs5
 .endif
+SUBDIR+=libtelnet
 .include <bsd.subdir.mk>
diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index 35e936e..7ee29e6 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -6,19 +6,20 @@ INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
 NOPIC=		yes
 
-SRCS=		genget.c getent.c misc.c encrypt.c auth.c kerberos.c \
-		enc_des.c pk.c sra.c
+SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
+		enc_des.c sra.c pk.c
+#SRCS+=		kerberos5.c
 
-CFLAGS+=	-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
-		-DKRB4 -DSRA -I${TELNETDIR} \
-		-I${KRB4DIR}/lib/krb
+CFLAGS=		-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
+		-DSRA -I${TELNETDIR}
+#CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5
 
-INCS=		${TELNETDIR}/arpa/telnet.h 
+INCS=		${TELNETDIR}/arpa/telnet.h
 INCDIR=		/usr/include/arpa
 
 #
 # Remove obsolete shared libraries, if any.  We don't bother moving them
-# to/usr/lib/compat, since they were only used by telnet, telnetd and
+# to /usr/lib/compat, since they were only used by telnet, telnetd and
 # tn3270.
 #
 beforeinstall:
diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile
index 5efa736..c1f685e 100644
--- a/kerberos5/libexec/Makefile
+++ b/kerberos5/libexec/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	ipropd-master ipropd-slave hpropd k5admind kdc k5passwdd
+SUBDIR=	ipropd-master ipropd-slave hpropd k5admind kdc k5passwdd telnetd
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile
index 4472990..24e3731 100644
--- a/kerberos5/libexec/telnetd/Makefile
+++ b/kerberos5/libexec/telnetd/Makefile
@@ -13,10 +13,10 @@ CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
 SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
 		termstat.c utility.c authenc.c
 
-DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \
-		${LIBCRYPT} ${LIBCOM_ERR} ${LIBMP} ${LIBPAM}
-LDADD=		-lutil -ltermcap ${LIBTELNET} -lcrypto \
-		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp ${MINUSLPAM}
+DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
+		${LIBCRYPT} ${LIBPAM}
+LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
+		-lcrypt ${MINUSLPAM}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index b218829..60f05e5 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	k5admin k5destroy k5init k5list k5passwd k5su
+SUBDIR=	k5admin k5destroy k5init k5list k5passwd k5su telnet
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
index 7d331f7..b2755c8 100644
--- a/kerberos5/usr.bin/telnet/Makefile
+++ b/kerberos5/usr.bin/telnet/Makefile
@@ -2,17 +2,18 @@
 
 PROG=		telnet
 
-CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
-		-DENCRYPTION -DAUTHENTICATION -DKRB4 \
-		-I${TELNETDIR} -DIPSEC -DINET6
+CFLAGS=		-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
+		-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
+		-I${TELNETDIR}
+#CFLAGS+=	-DKRB5
 
 SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 		telnet.c terminal.c tn3270.c utilities.c
 
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \
-		${LIBCOM_ERR} ${LIBIPSEC} ${LIBPAM}
-LDADD=		-ltermcap ${LIBTELNET} -lcrypto \
-		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec ${MINUSLPAM}
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \
+		${LIBIPSEC} ${LIBPAM}
+LDADD=		-ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \
+		-lipsec ${MINUSLPAM}
 
 .include <bsd.prog.mk>