Author: kib
Date: Sun May 4 07:57:20 2014
New Revision: 265314
URL: http://svnweb.freebsd.org/changeset/base/265314
Log:
MFC r265003:
Fix order of libthr and libc in the global dso list for sshd.
Modified:
stable/9/secure/usr.sbin/sshd/Makefile
Directory Properties:
stable/9/secure/usr.sbin/sshd/ (props changed)
Modified: stable/9/secure/usr.sbin/sshd/Makefile
==============================================================================
--- stable/9/secure/usr.sbin/sshd/Makefile Sun May 4 07:28:26 2014
(r265313)
+++ stable/9/secure/usr.sbin/sshd/Makefile Sun May 4 07:57:20 2014
(r265314)
@@ -50,6 +50,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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
