From owner-svn-src-all@FreeBSD.ORG Mon Mar 19 23:12:57 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B26E71065678 for ; Mon, 19 Mar 2012 23:12:57 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id EE3EF8FC1B for ; Mon, 19 Mar 2012 23:12:56 +0000 (UTC) Received: by wgbds12 with SMTP id ds12so1063274wgb.31 for ; Mon, 19 Mar 2012 16:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=saialF80KzWEqAp5ibZuWpQqLciHGtZ97aeb6yZmezE=; b=lHtPHSWAs/PXFv9qGSLx6BvrO3pIw6ZVqNnU/orp3EHHx+VnJfJcPTxZn1B2B3TDru EliJ0TjBEOEUfBJw1lC8EV+WJqkwlUM3UVTd5Hal1kG5mX9wwUJpYeK9ao2777ErSogq YXF1dnbxNIf2l0mF4Y1Kn2YKTsGKl6CiLUPyQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :content-transfer-encoding:x-gm-message-state; bh=saialF80KzWEqAp5ibZuWpQqLciHGtZ97aeb6yZmezE=; b=eyNgky/AsFc3nrWpRh3iBl6bJKnZKUwElAUuvym0U0UkUrYvtfHzXT7m8+BAozY4Vi cz58P6QvmO+zuORLbA5KUXMhaMSxlO0pNqcimBVhjJa4cE6BoK0S1krvn5fIjSOnYS7X U4XX8uroYihz8tPbMBx/UACncee/T+ekdYwVZWNfCsPPWNJ1jwyy6sd1tSVF4ayWUS4R 5mHsTYNbH6+q/UI/6Iw3/gywcleGpaly8qKvm+90l03GDcg2d7foVp9AnzB2tQrru5EA TY68dyqfbK/RG44Eh5L1V1+/dFQb9euZgXuUlcYhp2G/XWqDM2eS68xfqLkwdRO/kgkm 2Hfg== Received: by 10.216.136.131 with SMTP id w3mr8254736wei.15.1332198775913; Mon, 19 Mar 2012 16:12:55 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.223.63.4 with HTTP; Mon, 19 Mar 2012 16:12:25 -0700 (PDT) In-Reply-To: <86bons71qe.fsf@ds4.des.no> References: <201203190041.q2J0femX042684@svn.freebsd.org> <201203191359.34178.jhb@freebsd.org> <86bons71qe.fsf@ds4.des.no> From: Eitan Adler Date: Mon, 19 Mar 2012 19:12:25 -0400 X-Google-Sender-Auth: 97EQ7UpNjyljwUJU2ikYxRJJ0so Message-ID: To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Gm-Message-State: ALoCoQkW4cVlZDBKxflBeOu47qdX2WXZQAlztqc32ERXjlUg8AfjyDNsYQTBMiQivtMlEX6KqcWQ Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Colin Percival , John Baldwin Subject: Re: svn commit: r233136 - 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Mar 2012 23:12:57 -0000 2012/3/19 Dag-Erling Sm=C3=B8rgrav : > John Baldwin writes: Looking at the original contents of the two files sshd: -.if defined(X11BASE) || defined(LOCALBASE) ssh: -.if defined(X11BASE) 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. 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 ] commit 3b4f7b77abc6a0fadb3a15ebd7e8e8d475047842 Author: Eitan Adler Date: Mon Mar 19 19:07:35 2012 -0400 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) 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 +.if defined(LOCALBASE) +CFLAGS+=3D -DXAUTH_PATH=3D\"${LOCALBASE}/bin/xauth\" +.endif + .include .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 +.if defined(LOCALBASE) +CFLAGS+=3D -DXAUTH_PATH=3D\"${LOCALBASE}/bin/xauth\" +.endif + .include .PATH: ${SSHDIR} --=20 Eitan Adler Source & Ports committer X11, Bugbusting teams