summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1995-07-24 21:47:30 +0000
committerache <ache@FreeBSD.org>1995-07-24 21:47:30 +0000
commit8d6cb97e95d052737b47d360325425615f4ebb89 (patch)
treecda1df536821c41e8836c1ca6233070668ae8a90
parent96d8cee5234397e0210acbd78e32115213bf0b1f (diff)
downloadFreeBSD-src-8d6cb97e95d052737b47d360325425615f4ebb89.zip
FreeBSD-src-8d6cb97e95d052737b47d360325425615f4ebb89.tar.gz
Since this stuff not works with eBones, ifdef kerberos stuff
with MAKE_KERBEROS to allow other things to live Reviewed by: Submitted by: Obtained from:
-rw-r--r--eBones/libexec/telnetd/Makefile6
-rw-r--r--eBones/usr.bin/telnet/Makefile9
-rw-r--r--secure/libexec/telnetd/Makefile6
-rw-r--r--secure/usr.bin/telnet/Makefile9
4 files changed, 22 insertions, 8 deletions
diff --git a/eBones/libexec/telnetd/Makefile b/eBones/libexec/telnetd/Makefile
index 79dbb75..e867c69 100644
--- a/eBones/libexec/telnetd/Makefile
+++ b/eBones/libexec/telnetd/Makefile
@@ -1,5 +1,9 @@
# @(#)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
+
PROG= telnetd
CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
CFLAGS+=-DOLD_ENVIRON -DENV_HACK
@@ -15,9 +19,11 @@ MAN8= telnetd.8
CFLAGS+=-DAUTHENTICATION -DENCRYPTION
+.ifdef MAKE_KERBEROS
.if exists(/usr/lib/libkrb.a)
LDADD+= -lkrb -ldes
.endif
+.endif
#endif /* ENCRYPTION */
diff --git a/eBones/usr.bin/telnet/Makefile b/eBones/usr.bin/telnet/Makefile
index 1c0eacb..b7f5085 100644
--- a/eBones/usr.bin/telnet/Makefile
+++ b/eBones/usr.bin/telnet/Makefile
@@ -35,6 +35,7 @@
# 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
@@ -47,18 +48,18 @@ LDADD+= -ltermcap -ltelnet
CFLAGS+=-DAUTHENTICATION -DENCRYPTION
+.ifdef MAKE_KERBEROS
.if exists(/usr/lib/libkrb.a)
CFLAGS+= -DKRB4
-LDADD+= -lkrb
+LDADD+= -lkrb -ldes
+.endif
.endif
.if exists(/usr/lib/libkrb5.a)
CFLAGS+= -DKRB5 -DFORWARD
-LDADD+= -lkrb5
+LDADD+= -lkrb5 -ldes
.endif
-LDADD+= -ldes
-
#endif /* ENCRYPTION */
DPADD= ${LIBTERMCAP}
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index 79dbb75..e867c69 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -1,5 +1,9 @@
# @(#)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
+
PROG= telnetd
CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
CFLAGS+=-DOLD_ENVIRON -DENV_HACK
@@ -15,9 +19,11 @@ MAN8= telnetd.8
CFLAGS+=-DAUTHENTICATION -DENCRYPTION
+.ifdef MAKE_KERBEROS
.if exists(/usr/lib/libkrb.a)
LDADD+= -lkrb -ldes
.endif
+.endif
#endif /* ENCRYPTION */
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
index 1c0eacb..b7f5085 100644
--- a/secure/usr.bin/telnet/Makefile
+++ b/secure/usr.bin/telnet/Makefile
@@ -35,6 +35,7 @@
# 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
@@ -47,18 +48,18 @@ LDADD+= -ltermcap -ltelnet
CFLAGS+=-DAUTHENTICATION -DENCRYPTION
+.ifdef MAKE_KERBEROS
.if exists(/usr/lib/libkrb.a)
CFLAGS+= -DKRB4
-LDADD+= -lkrb
+LDADD+= -lkrb -ldes
+.endif
.endif
.if exists(/usr/lib/libkrb5.a)
CFLAGS+= -DKRB5 -DFORWARD
-LDADD+= -lkrb5
+LDADD+= -lkrb5 -ldes
.endif
-LDADD+= -ldes
-
#endif /* ENCRYPTION */
DPADD= ${LIBTERMCAP}
OpenPOWER on IntegriCloud