diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index 69e63af4e272..6bc2f5a51de0 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -1,27 +1,28 @@ .include PACKAGE=lib${LIB} TELNETDIR= ${SRCTOP}/contrib/telnet .PATH: ${TELNETDIR}/libtelnet LIB= telnet INTERNALLIB= SRCS= genget.c getent.c misc.c CFLAGS+= -I${TELNETDIR} WARNS?= 2 .if ${MK_OPENSSL} != "no" SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L .endif -.if ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_KERBEROS_SUPPORT} != "no" && ${MK_MITKRB5} != "yes" +# MIT KRB5 deprecated and removed 3DES. Therefore no telnet support. SRCS+= kerberos5.c CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write .endif .include diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 930d70faa8ba..9197d44db94c 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,38 +1,39 @@ .include PACKAGE= telnet TELNETDIR= ${SRCTOP}/contrib/telnet .PATH: ${TELNETDIR}/telnet PROG= telnet SRCS= commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c utilities.c CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \ -I${TELNETDIR} -I${TELNETDIR}/libtelnet/ .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif WARNS?= 2 LIBADD= telnet tinfow CFLAGS+= -DIPSEC LIBADD+= ipsec .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC LIBADD+= mp crypto ipsec pam .endif -.if ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_KERBEROS_SUPPORT} != "no" && ${MK_MITKRB5} != "yes" +# MIT KRB5 deprecated and removed 3DES. Therefore no telnet support. CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write LIBADD+= krb5 roken .endif .include