summaryrefslogtreecommitdiffstats
path: root/secure/usr.bin
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2003-05-05 07:58:44 +0000
committermarkm <markm@FreeBSD.org>2003-05-05 07:58:44 +0000
commitee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003 (patch)
tree56d309156db9452465ff78724b6b4c3a6e0cbcba /secure/usr.bin
parenta7d933895cee5d8535b76f436f05f14decfd5967 (diff)
downloadFreeBSD-src-ee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003.zip
FreeBSD-src-ee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003.tar.gz
Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code was syntax checked, not run checked.
Diffstat (limited to 'secure/usr.bin')
-rw-r--r--secure/usr.bin/Makefile2
-rw-r--r--secure/usr.bin/ssh/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index a6bf02b..791c8c5 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -6,7 +6,7 @@ SUBDIR+=openssl
.if !defined(NO_OPENSSH)
SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
.endif
-.if !defined(MAKE_KERBEROS5)
+.if defined(NO_KERBEROS)
SUBDIR+=telnet
.endif
.endif
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index b87cdca..d79f44f 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -10,7 +10,7 @@ MLINKS= ssh.1 slogin.1
SRCS= ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \
sshconnect.c sshconnect1.c sshconnect2.c
-.if defined(MAKE_KERBEROS5)
+.if !defined(NO_KERBEROS)
CFLAGS+= -DKRB5 -DHEIMDAL
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt
DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT}
OpenPOWER on IntegriCloud