aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin T. Gibbs <gibbs@FreeBSD.org>1995-09-14 21:29:21 +0000
committerJustin T. Gibbs <gibbs@FreeBSD.org>1995-09-14 21:29:21 +0000
commit790136a438df0d55688ade46ec84017c5da1c6be (patch)
treed984e720845380cce8b0dda3e31168b2e8f5d8c5
parent9d6965ac063229672df5937228ea85715c6eb655 (diff)
downloadsrc-790136a438df0d55688ade46ec84017c5da1c6be.tar.gz
src-790136a438df0d55688ade46ec84017c5da1c6be.zip
Enable kerberosIV authentication/encryption conditionalized on MAKE_EBONES.
Notes
Notes: svn path=/head/; revision=10741
-rw-r--r--eBones/libexec/telnetd/Makefile6
-rw-r--r--eBones/usr.bin/telnet/Makefile6
-rw-r--r--secure/libexec/telnetd/Makefile6
-rw-r--r--secure/usr.bin/telnet/Makefile6
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