diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-06-19 05:27:06 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-06-19 05:27:06 +0000 |
| commit | 9a61793ff5f29a5a74751fe82131e74c02c3de72 (patch) | |
| tree | 7353ac52b053296449bf803a159decd7335011a3 | |
| parent | Do not install pcap-int.h to /usr/include as it is an internal library (diff) | |
| download | wireguard-openbsd-9a61793ff5f29a5a74751fe82131e74c02c3de72.tar.xz wireguard-openbsd-9a61793ff5f29a5a74751fe82131e74c02c3de72.zip | |
stop doing kerberos in ssh and sshd
the code bloat makes that no longer trustworthy functionality
ok guenther
| -rw-r--r-- | usr.bin/ssh/ssh/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index fd4a7e7899b..d30b74ad0f1 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.59 2013/06/18 20:27:20 miod Exp $ +# $OpenBSD: Makefile,v 1.60 2013/06/19 05:27:06 deraadt Exp $ .PATH: ${.CURDIR}/.. @@ -17,6 +17,7 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ roaming_common.c roaming_client.c .include <bsd.own.mk> +KERBEROS5=no .if (${KERBEROS5:L} == "yes") CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV -DGSSAPI diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile index 800b849e441..5caa77eeaaf 100644 --- a/usr.bin/ssh/sshd/Makefile +++ b/usr.bin/ssh/sshd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.75 2013/06/18 20:27:20 miod Exp $ +# $OpenBSD: Makefile,v 1.76 2013/06/19 05:27:07 deraadt Exp $ .PATH: ${.CURDIR}/.. @@ -19,6 +19,7 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ roaming_common.c roaming_serv.c sandbox-systrace.c .include <bsd.own.mk> # for KERBEROS and AFS +KERBEROS5=no .if (${KERBEROS5:L} == "yes") CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV -DGSSAPI |