aboutsummaryrefslogtreecommitdiffstats
path: root/secure/usr.sbin/sshd
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2014-11-04 23:32:45 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2014-11-04 23:32:45 +0000
commit7cebf7e583e85beb2434c3dac21c4e3db1873134 (patch)
tree7737d959c3d040d766284ccbee58db8287d7a6f7 /secure/usr.sbin/sshd
parenteb5534a05f5ce0574f09cf0beecf2e4758abf670 (diff)
downloadsrc-7cebf7e583e85beb2434c3dac21c4e3db1873134.tar.gz
src-7cebf7e583e85beb2434c3dac21c4e3db1873134.zip
[SA-14:24] Fix denial of service attack against sshd(8).
[SA-14:25] Fix kernel stack disclosure in setlogin(2) / getlogin(2). [SA-14:26] Fix remote command execution in ftp(1). [EN-14:12] Fix NFSv4 and ZFS cache consistency issue. Approved by: so (des)
Notes
Notes: svn path=/releng/9.1/; revision=274112
Diffstat (limited to 'secure/usr.sbin/sshd')
-rw-r--r--secure/usr.sbin/sshd/Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index f587263f7faf..895bcb43c0ec 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -42,6 +42,16 @@ LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
+# Fix the order of NEEDED entries for libthr and libc. The libthr
+# needs to interpose libc symbols, leaving the libthr loading as
+# dependency of krb causes reversed order and broken interposing. Put
+# the threading library last on the linker command line, just before
+# the -lc added by a compiler driver.
+.if ${MK_KERBEROS_SUPPORT} != "no"
+DPADD+= ${LIBPTHREAD}
+LDADD+= -lpthread
+.endif
+
.if defined(LOCALBASE)
CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
.endif