svn commit: r233136 - in head/secure: usr.bin/ssh usr.sbin/sshd

[John Baldwin]

On Monday, March 19, 2012 7:12:25 pm Eitan Adler wrote:
> 2012/3/19 Dag-Erling Smørgrav <des at des.no>:
> > John Baldwin <jhb at 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 ]

This looks good to me.  I suspect it was just a bug in the ssh Makefile 
originally.

> commit 3b4f7b77abc6a0fadb3a15ebd7e8e8d475047842
> Author: Eitan Adler <lists at 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+=	 -lgssapi
>  DPADD+=	${LIBCRYPT} ${LIBCRYPTO}
>  LDADD+=	-lcrypt -lcrypto
> 
> +.if defined(LOCALBASE)
> +CFLAGS+= -DXAUTH_PATH=\"${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+=	 -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
>  DPADD+=	${LIBCRYPTO} ${LIBCRYPT}
>  LDADD+=	-lcrypto -lcrypt
> 
> +.if defined(LOCALBASE)
> +CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
> +.endif
> +
>  .include <bsd.prog.mk>
> 
>  .PATH:	${SSHDIR}
> 
> 
> 
> -- 
> Eitan Adler
> Source & Ports committer
> X11, Bugbusting teams
> 

-- 
John Baldwin