svn commit: r265313 - stable/10/secure/usr.sbin/sshd

[Konstantin Belousov]

Author: kib
Date: Sun May  4 07:28:26 2014
New Revision: 265313
URL: http://svnweb.freebsd.org/changeset/base/265313

Log:
  MFC r265003:
  Fix order of libthr and libc in the global dso list for sshd.

Modified:
  stable/10/secure/usr.sbin/sshd/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/secure/usr.sbin/sshd/Makefile
==============================================================================
--- stable/10/secure/usr.sbin/sshd/Makefile	Sun May  4 07:22:51 2014	(r265312)
+++ stable/10/secure/usr.sbin/sshd/Makefile	Sun May  4 07:28:26 2014	(r265313)
@@ -57,6 +57,16 @@ CFLAGS+= -DNONE_CIPHER_ENABLED
 DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
 LDADD+= -lcrypt -lcrypto -lz
 
+# 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