From owner-svn-src-all@FreeBSD.ORG  Sat Mar 24 19:41:43 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E3E23106564A;
	Sat, 24 Mar 2012 19:41:43 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CEB1F8FC16;
	Sat, 24 Mar 2012 19:41:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2OJfh5C046191;
	Sat, 24 Mar 2012 19:41:43 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2OJfhoq046188;
	Sat, 24 Mar 2012 19:41:43 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201203241941.q2OJfhoq046188@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 24 Mar 2012 19:41:43 +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: r233432 - in head/secure: usr.bin/ssh usr.sbin/sshd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Mar 2012 19:41:44 -0000

Author: eadler
Date: Sat Mar 24 19:41:43 2012
New Revision: 233432
URL: http://svn.freebsd.org/changeset/base/233432

Log:
  Restore the ability to use a non-standard LOCALBASE to sshd
  Add the ability to use a non-standard LOCALBASE to ssh
  
  Submitted by:	jhb
  Reviewed by:	des
  Approved by:	cperciva
  MFC after:	0 days (with r233136)

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

Modified: head/secure/usr.bin/ssh/Makefile
==============================================================================
--- head/secure/usr.bin/ssh/Makefile	Sat Mar 24 19:14:44 2012	(r233431)
+++ head/secure/usr.bin/ssh/Makefile	Sat Mar 24 19:41:43 2012	(r233432)
@@ -28,6 +28,10 @@ LDADD+=	 -lgssapi
 DPADD+=	${LIBCRYPT} ${LIBCRYPTO}
 LDADD+=	-lcrypt -lcrypto
 
+.if defined(LOCALBASE)
+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
+.endif
+
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}

Modified: head/secure/usr.sbin/sshd/Makefile
==============================================================================
--- head/secure/usr.sbin/sshd/Makefile	Sat Mar 24 19:14:44 2012	(r233431)
+++ head/secure/usr.sbin/sshd/Makefile	Sat Mar 24 19:41:43 2012	(r233432)
@@ -43,6 +43,10 @@ LDADD+=	 -lgssapi_krb5 -lgssapi -lkrb5 -
 DPADD+=	${LIBCRYPTO} ${LIBCRYPT}
 LDADD+=	-lcrypto -lcrypt
 
+.if defined(LOCALBASE)
+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
+.endif
+
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}