From owner-svn-src-head@FreeBSD.ORG  Fri Feb 26 12:12:54 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 58567106566C;
	Fri, 26 Feb 2010 12:12:54 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 47E448FC13;
	Fri, 26 Feb 2010 12:12:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1QCCsu5035191;
	Fri, 26 Feb 2010 12:12:54 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1QCCs2Z035189;
	Fri, 26 Feb 2010 12:12:54 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201002261212.o1QCCs2Z035189@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 26 Feb 2010 12:12:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204355 - head/secure/usr.sbin/sshd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Feb 2010 12:12:54 -0000

Author: ru
Date: Fri Feb 26 12:12:54 2010
New Revision: 204355
URL: http://svn.freebsd.org/changeset/base/204355

Log:
  (Almost) fixed static linkage.  The remaining problem is with
  libgssapi.a and libgssapi_krb5.a libraries that define the
  same symbols.

Modified:
  head/secure/usr.sbin/sshd/Makefile

Modified: head/secure/usr.sbin/sshd/Makefile
==============================================================================
--- head/secure/usr.sbin/sshd/Makefile	Fri Feb 26 10:42:46 2010	(r204354)
+++ head/secure/usr.sbin/sshd/Makefile	Fri Feb 26 12:12:54 2010	(r204355)
@@ -34,8 +34,8 @@ LDADD+=  -lbsm
 
 .if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DHAVE_GSSAPI_GSSAPI_KRB5_H=1 -DKRB5 -DHEIMDAL
-DPADD+=	 ${LIBGSSAPI} ${LIBGSSAPI_KRB5}
-LDADD+=	 -lgssapi -lgssapi_krb5
+DPADD+=	 ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1}
+LDADD+=	 -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
 .endif
 
 .if defined(X11BASE)