Page MenuHomeFreeBSD

ssh: Move XAUTH_PATH setting to ssh.mk
ClosedPublic

Authored by emaste on Sun, Feb 9, 11:42 PM.
Tags
None
Referenced Files
F110642009: D48907.id150760.diff
Fri, Feb 21, 8:26 AM
Unknown Object (File)
Wed, Feb 19, 3:10 PM
Unknown Object (File)
Tue, Feb 18, 10:02 AM
Unknown Object (File)
Mon, Feb 17, 8:11 AM
Unknown Object (File)
Mon, Feb 10, 4:24 PM
Unknown Object (File)
Mon, Feb 10, 12:26 AM
Unknown Object (File)
Mon, Feb 10, 12:21 AM
Unknown Object (File)
Mon, Feb 10, 12:18 AM
Subscribers

Details

Summary
XAUTH_PATH is normally set (in the upstream build infrastructure) in
config.h.  We previously set it in ssh and sshd's Makefiles if LOCALBASE
is set, and over time have occasionally defined it in config.h.

Leave it unset in config.h and move the CFLAGS logic to to ssh.mk so
that it will be set when building all ssh libraries and programs but
still be set by LOCALBASE.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

emaste created this revision.
crypto/openssh/config.h
2018

Note that crypto/openssh/freebsd-configure.sh runs configure with --without-xauth so this is more consistent with the way we generate config.h.

secure/ssh.mk
12

Or ${LOCALBASE:U/usr/local}

This revision is now accepted and ready to land.Mon, Feb 10, 2:57 AM

Use /usr/local by default if LOCALBASE not set

This revision now requires review to proceed.Mon, Feb 10, 1:08 PM
jlduran added inline comments.
secure/ssh.mk
12

With this approach, LOCALBASE and XAUTH_PATH will always be defined (and therefore _PATH_XAUTH).
I guess this is what is desired.

This revision is now accepted and ready to land.Mon, Feb 10, 4:13 PM
This revision was automatically updated to reflect the committed changes.