Date: Mon, 19 Mar 2012 19:12:25 -0400 From: Eitan Adler <eadler@freebsd.org> To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= <des@des.no> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Colin Percival <cperciva@freebsd.org>, John Baldwin <jhb@freebsd.org> Subject: Re: svn commit: r233136 - in head/secure: usr.bin/ssh usr.sbin/sshd Message-ID: <CAF6rxg=0QOBrSdrn2t1zhXD5pX_tmAOYa=Bp0mFpU=F2Q1AzOQ@mail.gmail.com> In-Reply-To: <86bons71qe.fsf@ds4.des.no> References: <201203190041.q2J0femX042684@svn.freebsd.org> <CAF6rxgk1zfS8hDQPmFWEYZEFehvxyjUSZhbH-WXMLn3rLc754w@mail.gmail.com> <CAF6rxg=0BPZ_w2debm_D_bD-d2NM%2BA5F4yL6=BCj6ADStCFH9A@mail.gmail.com> <201203191359.34178.jhb@freebsd.org> <86bons71qe.fsf@ds4.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
2012/3/19 Dag-Erling Sm=C3=B8rgrav <des@des.no>:
> John Baldwin <jhb@freebsd.org> 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 <lists@eitanadler.com>
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 <bsd.prog.mk>
.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 <bsd.prog.mk>
.PATH: ${SSHDIR}
--=20
Eitan Adler
Source & Ports committer
X11, Bugbusting teams
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxg=0QOBrSdrn2t1zhXD5pX_tmAOYa=Bp0mFpU=F2Q1AzOQ>