diff options
| author |   hin <hin@openbsd.org> | 2003-04-09 08:24:24 +0000 |
|---|---|---|
| committer | hin <hin@openbsd.org> | 2003-04-09 08:24:24 +0000 |
| commit | 8ee24983461b58b7cf835effc1e5b76e31d881ea (patch) | |
| tree | b71c7d8415167a50e1c908293f8739d51908b4ce | |
| parent | Don't include <krb.h> when compiling with Kerberos 5 support (diff) | |
| download | wireguard-openbsd-8ee24983461b58b7cf835effc1e5b76e31d881ea.tar.xz wireguard-openbsd-8ee24983461b58b7cf835effc1e5b76e31d881ea.zip | |
Disable Kerberos 4 support.
ok markus@
| -rw-r--r-- | usr.bin/ssh/lib/Makefile | 10 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh/Makefile | 13 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd/Makefile | 14 |
3 files changed, 3 insertions, 34 deletions
diff --git a/usr.bin/ssh/lib/Makefile b/usr.bin/ssh/lib/Makefile index 2f8ff8d9ba7..a6495134c0c 100644 --- a/usr.bin/ssh/lib/Makefile +++ b/usr.bin/ssh/lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2003/02/21 09:04:09 markus Exp $ +# $OpenBSD: Makefile,v 1.40 2003/04/09 08:24:24 hin Exp $ .PATH: ${.CURDIR}/.. @@ -24,12 +24,4 @@ install: CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV .endif # KERBEROS5 -.if (${KERBEROS:L} == "yes") -CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV -.if (${AFS:L} == "yes") -CFLAGS+= -DAFS -SRCS+= radix.c -.endif # AFS -.endif # KERBEROS - .include <bsd.lib.mk> diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index 80511de5f4e..55c545bd828 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2002/06/20 19:56:07 stevesk Exp $ +# $OpenBSD: Makefile,v 1.43 2003/04/09 08:24:24 hin Exp $ .PATH: ${.CURDIR}/.. @@ -23,17 +23,6 @@ LDADD+= -lkrb5 -lasn1 -lcom_err DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} .endif # KERBEROS5 -.if (${KERBEROS:L} == "yes") -CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV -LDADD+= -lkrb -DPADD+= ${LIBKRB} -.if (${AFS:L} == "yes") -CFLAGS+= -DAFS -LDADD+= -lkafs -DPADD+= ${LIBKAFS} -.endif # AFS -.endif # KERBEROS - .include <bsd.prog.mk> LDADD+= -lcrypto -lz -ldes diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile index 8b80e48f2ad..9979a40af73 100644 --- a/usr.bin/ssh/sshd/Makefile +++ b/usr.bin/ssh/sshd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2003/02/21 09:04:09 markus Exp $ +# $OpenBSD: Makefile,v 1.53 2003/04/09 08:24:24 hin Exp $ .PATH: ${.CURDIR}/.. @@ -27,18 +27,6 @@ LDADD+= -lkrb5 -lkafs -lasn1 -lcom_err DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCOM_ERR} .endif # KERBEROS5 -.if (${KERBEROS:L} == "yes") -.if (${AFS:L} == "yes") -CFLAGS+= -DAFS -LDADD+= -lkafs -DPADD+= ${LIBKAFS} -.endif # AFS -CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV -SRCS+= auth-krb4.c -LDADD+= -lkrb -DPADD+= ${LIBKRB} -.endif # KERBEROS - .include <bsd.prog.mk> LDADD+= -lcrypto -lutil -lz -ldes |