aboutsummaryrefslogtreecommitdiff
path: root/secure/usr.sbin
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2017-03-06 01:37:05 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2017-03-06 01:37:05 +0000
commitca86bcf2531c7b149c95244a67853d44323e7855 (patch)
tree23390addad9593662304883efe4cae60bd1670a4 /secure/usr.sbin
parent53de37f8ca93019f38b66657ba5f2bf53beff012 (diff)
parent19ca85510bbe080af3faf5e9ae394608428ac953 (diff)
downloadsrc-ca86bcf2531c7b149c95244a67853d44323e7855.tar.gz
src-ca86bcf2531c7b149c95244a67853d44323e7855.zip
Upgrade to OpenSSH 7.4p1.
Notes
Notes: svn path=/head/; revision=314720
Diffstat (limited to 'secure/usr.sbin')
-rw-r--r--secure/usr.sbin/sshd/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 5fb1e23a2a40..93832a9c7583 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -3,14 +3,14 @@
.include <src.opts.mk>
PROG= sshd
-SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
+SRCS= sshd.c auth-rhosts.c auth-passwd.c \
audit.c audit-bsm.c audit-linux.c platform.c \
sshpty.c sshlogin.c servconf.c serverloop.c \
- auth.c auth1.c auth2.c auth-options.c session.c \
- auth-chall.c auth2-chall.c groupaccess.c \
+ auth.c auth2.c auth-options.c session.c \
+ auth2-chall.c groupaccess.c \
auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
auth2-none.c auth2-passwd.c auth2-pubkey.c \
- monitor_mm.c monitor.c monitor_wrap.c auth-krb5.c \
+ monitor.c monitor_wrap.c auth-krb5.c \
auth2-gss.c gss-serv.c gss-serv-krb5.c \
loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
sftp-server.c sftp-common.c \
@@ -36,12 +36,12 @@ CFLAGS+= -DHAVE_LDNS=1
.endif
.if ${MK_AUDIT} != "no"
-CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR
+CFLAGS+= -DUSE_BSM_AUDIT=1 -DHAVE_GETAUDIT_ADDR=1
LIBADD+= bsm
.endif
.if ${MK_BLACKLIST_SUPPORT} != "no"
-CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blacklist/include
+CFLAGS+= -DUSE_BLACKLIST=1 -I${SRCTOP}/contrib/blacklist/include
SRCS+= blacklist.c
LIBADD+= blacklist
LDFLAGS+=-L${LIBBLACKLISTDIR}
@@ -54,7 +54,7 @@ LIBADD+= gssapi_krb5 gssapi krb5
.endif
.if ${MK_TCP_WRAPPERS} != "no"
-CFLAGS+= -DLIBWRAP
+CFLAGS+= -DLIBWRAP=1
LIBADD+= wrap
.endif