system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse source 
Kerberos5 has _a_ telnet (which is not currently K5 enabled).
Incorporate BDE's static linking fixes.
This commit is contained in:
Mark Murray 2001-08-03 16:03:26 +00:00
parent 0512c8b6ab
commit 563df95270
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=81104
14 changed files with 59 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kerberos5/Makefile.inc
View file

@ -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

1
kerberos5/lib/Makefile
View file

@ -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>

15
kerberos5/lib/libtelnet/Makefile
View file

@ -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:

2
kerberos5/libexec/Makefile
View file

@ -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>

8
kerberos5/libexec/telnetd/Makefile
View file

@ -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>

2
kerberos5/usr.bin/Makefile
View file

@ -1,5 +1,5 @@
# $FreeBSD$
SUBDIR= k5admin k5destroy k5init k5list k5passwd k5su
SUBDIR= k5admin k5destroy k5init k5list k5passwd k5su telnet
.include <bsd.subdir.mk>

15
kerberos5/usr.bin/telnet/Makefile
View file

@ -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>

15
kerberosIV/lib/libtelnet/Makefile
View file

@ -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+= kerberos.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+= -DKRB4 -I${KRB4DIR}/lib/krb
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:

11
kerberosIV/libexec/telnetd/Makefile
View file

@ -6,17 +6,18 @@
PROG= telnetd
MAN= telnetd.8
CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
CFLAGS= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
-I${TELNETDIR} -DINET6
CFLAGS+= -DKRB4
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} \
${LIBKRB} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBPAM}
LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err ${MINUSLPAM}
.include <bsd.prog.mk>

15
kerberosIV/usr.bin/telnet/Makefile
View file

@ -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+= -DKRB4
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} ${LIBKRB} \
${LIBCRYPT} ${LIBCOM_ERR} ${LIBIPSEC} ${LIBPAM}
LDADD= -ltermcap ${LIBTELNET} -lmp -lcrypto \
-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lipsec ${MINUSLPAM}
.include <bsd.prog.mk>

2
secure/lib/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
SUBDIR= libcipher
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4)
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5)
SUBDIR+=libtelnet
.endif
.if !defined(NO_OPENSSL)

4
secure/lib/libtelnet/Makefile
View file

@ -9,8 +9,8 @@ NOPIC= yes
SRCS= genget.c getent.c misc.c encrypt.c auth.c \
enc_des.c sra.c pk.c
CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
-DSRA -I${TELNETDIR}
CFLAGS= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
-DSRA -I${TELNETDIR}
INCS= ${TELNETDIR}/arpa/telnet.h
INCDIR= /usr/include/arpa

2
secure/libexec/Makefile
View file

@ -1,6 +1,6 @@
# $FreeBSD$
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL)
.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL)
SUBDIR= telnetd
.endif
.if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)

6
secure/usr.bin/telnet/Makefile
View file

@ -2,9 +2,9 @@
PROG= telnet
CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
-DENCRYPTION -DAUTHENTICATION -I${TELNETDIR}
CFLAGS+= -DIPSEC -DINET6
CFLAGS= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
-I${TELNETDIR}
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
telnet.c terminal.c tn3270.c utilities.c