From 790136a438df0d55688ade46ec84017c5da1c6be Mon Sep 17 00:00:00 2001 From: "Justin T. Gibbs" Date: Thu, 14 Sep 1995 21:29:21 +0000 Subject: [PATCH] Enable kerberosIV authentication/encryption conditionalized on MAKE_EBONES. --- eBones/libexec/telnetd/Makefile | 6 +----- eBones/usr.bin/telnet/Makefile | 6 +----- secure/libexec/telnetd/Makefile | 6 +----- secure/usr.bin/telnet/Makefile | 6 +----- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/eBones/libexec/telnetd/Makefile b/eBones/libexec/telnetd/Makefile index 17ffa3e0a2d7..977271d6ec2f 100644 --- a/eBones/libexec/telnetd/Makefile +++ b/eBones/libexec/telnetd/Makefile @@ -1,9 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 12/15/93 -# This stuff need original libdes to run (new_rnd_key.c module), -# current eBones/des lib don't have it -# Kerberos4 stuff ifdefed by MAKE_KERBEROS (make.conf) because of it - # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -23,7 +19,7 @@ CFLAGS+=-I${.CURDIR}/../../lib CFLAGS+=-DAUTHENTICATION -DENCRYPTION -.ifdef MAKE_KERBEROS +.ifdef MAKE_EBONES .if exists(/usr/lib/libkrb.a) LDADD+= -ldes -lkrb .endif diff --git a/eBones/usr.bin/telnet/Makefile b/eBones/usr.bin/telnet/Makefile index 20befdde5d56..c77577af25a2 100644 --- a/eBones/usr.bin/telnet/Makefile +++ b/eBones/usr.bin/telnet/Makefile @@ -33,10 +33,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # -# This stuff need original libdes to run (new_rnd_key.c module), -# current eBones/des lib don't have it -# Kerberos4 stuff ifdefed by MAKE_KERBEROS (make.conf) because of it - PROG= telnet CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO @@ -48,7 +44,7 @@ LDADD+= -ltermcap -ltelnet CFLAGS+=-DAUTHENTICATION -DENCRYPTION -.ifdef MAKE_KERBEROS +.ifdef MAKE_EBONES .if exists(/usr/lib/libkrb.a) CFLAGS+= -DKRB4 LDADD+= -ldes -lkrb diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile index 17ffa3e0a2d7..977271d6ec2f 100644 --- a/secure/libexec/telnetd/Makefile +++ b/secure/libexec/telnetd/Makefile @@ -1,9 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 12/15/93 -# This stuff need original libdes to run (new_rnd_key.c module), -# current eBones/des lib don't have it -# Kerberos4 stuff ifdefed by MAKE_KERBEROS (make.conf) because of it - # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -23,7 +19,7 @@ CFLAGS+=-I${.CURDIR}/../../lib CFLAGS+=-DAUTHENTICATION -DENCRYPTION -.ifdef MAKE_KERBEROS +.ifdef MAKE_EBONES .if exists(/usr/lib/libkrb.a) LDADD+= -ldes -lkrb .endif diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index 20befdde5d56..c77577af25a2 100644 --- a/secure/usr.bin/telnet/Makefile +++ b/secure/usr.bin/telnet/Makefile @@ -33,10 +33,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # -# This stuff need original libdes to run (new_rnd_key.c module), -# current eBones/des lib don't have it -# Kerberos4 stuff ifdefed by MAKE_KERBEROS (make.conf) because of it - PROG= telnet CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO @@ -48,7 +44,7 @@ LDADD+= -ltermcap -ltelnet CFLAGS+=-DAUTHENTICATION -DENCRYPTION -.ifdef MAKE_KERBEROS +.ifdef MAKE_EBONES .if exists(/usr/lib/libkrb.a) CFLAGS+= -DKRB4 LDADD+= -ldes -lkrb