From owner-svn-src-head@FreeBSD.ORG Tue Mar 20 19:04:00 2012 Return-Path: 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 74A1F1065674; Tue, 20 Mar 2012 19:04:00 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 42F558FC14; Tue, 20 Mar 2012 19:04:00 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) by cyrus.watson.org (Postfix) with ESMTPSA id EB51246B3F; Tue, 20 Mar 2012 15:03:59 -0400 (EDT) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 65D5CB91C; Tue, 20 Mar 2012 15:03:59 -0400 (EDT) From: John Baldwin To: Eitan Adler Date: Tue, 20 Mar 2012 14:52:27 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p10; KDE/4.5.5; amd64; ; ) References: <201203190041.q2J0femX042684@svn.freebsd.org> <86bons71qe.fsf@ds4.des.no> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <201203201452.27484.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 20 Mar 2012 15:03:59 -0400 (EDT) Cc: svn-src-head@freebsd.org, Dag-Erling =?utf-8?q?Sm=C3=B8rgrav?= , svn-src-all@freebsd.org, src-committers@freebsd.org, Colin Percival Subject: Re: svn commit: r233136 - in head/secure: usr.bin/ssh 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Mar 2012 19:04:00 -0000 On Monday, March 19, 2012 7:12:25 pm Eitan Adler wrote: > 2012/3/19 Dag-Erling Sm=C3=B8rgrav : > > John Baldwin writes: >=20 > Looking at the original contents of the two files >=20 > sshd: > -.if defined(X11BASE) || defined(LOCALBASE) >=20 > ssh: > -.if defined(X11BASE) >=20 > which I think was the cause of my original confusion. The change *was* > a no-op for ssh but resulted in behavior change when LOCALBASE was > defined in sshd. >=20 > What do you think of the following patch which uses the same .defined > version as the original restores LOCALBASE support in sshd and and > adds support to ssh? Is there a reason for the difference between the > two? [ build tested only ] This looks good to me. I suspect it was just a bug in the ssh Makefile=20 originally. > commit 3b4f7b77abc6a0fadb3a15ebd7e8e8d475047842 > Author: Eitan Adler > Date: Mon Mar 19 19:07:35 2012 -0400 >=20 > Restore the ability to use a non-standard LOCALBASE to sshd > Add the ability to use a non-standard LOCALBASE to ssh >=20 > Submitted by: jhb > Reviewed by: des > Approved by: cperciva > MFC after: 0 days (with r233136) >=20 > diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile > index 619c44a..9304fd55 100644 > --- a/secure/usr.bin/ssh/Makefile > +++ b/secure/usr.bin/ssh/Makefile > @@ -28,6 +28,10 @@ LDADD+=3D -lgssapi > DPADD+=3D ${LIBCRYPT} ${LIBCRYPTO} > LDADD+=3D -lcrypt -lcrypto >=20 > +.if defined(LOCALBASE) > +CFLAGS+=3D -DXAUTH_PATH=3D\"${LOCALBASE}/bin/xauth\" > +.endif > + > .include >=20 > .PATH: ${SSHDIR} > diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile > index 0120771..cc914c4 100644 > --- a/secure/usr.sbin/sshd/Makefile > +++ b/secure/usr.sbin/sshd/Makefile > @@ -43,6 +43,10 @@ LDADD+=3D -lgssapi_krb5 -lgssapi -lkrb5 -lasn1 > DPADD+=3D ${LIBCRYPTO} ${LIBCRYPT} > LDADD+=3D -lcrypto -lcrypt >=20 > +.if defined(LOCALBASE) > +CFLAGS+=3D -DXAUTH_PATH=3D\"${LOCALBASE}/bin/xauth\" > +.endif > + > .include >=20 > .PATH: ${SSHDIR} >=20 >=20 >=20 > --=20 > Eitan Adler > Source & Ports committer > X11, Bugbusting teams >=20 =2D-=20 John Baldwin