diff options
| author | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
| commit | 0f31b02d696704321e4e94e63dceff52599ab808 (patch) | |
| tree | 953c18ea1e163d5ebd4b0d153b6378646ff41808 /secure/usr.sbin | |
| parent | 5080a59fa0c3561940d69fe29dc75ac489f0183a (diff) | |
| download | FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.zip FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.tar.gz | |
MFS (r296781):
MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug)
MFH (r296634): re-add aes-cbc to server-side default cipher list
MFH (r296651, r296657): fix gcc build of pam_ssh
PR: 207679
Security: CVE-2016-3115
Approved by: re (marius)
Diffstat (limited to 'secure/usr.sbin')
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 5fb7084..51a944a 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -14,9 +14,9 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.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 \ - roaming_common.c roaming_serv.c \ sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c \ - sandbox-seccomp-filter.c sandbox-capsicum.c + sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c \ + sandbox-solaris.c # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c |
