ssh, sshd: update paths

[emaste]

Summary

FreeBSD commits:
R10:ffea3f5a05a0d8cf12aeb894e0c4240d9928d159
R10:1f474190fc280d4a4ef0c214e4d7fff0d1237e22

[se]

This review seems to lack some context ...

Most of these changes have been in FreeBSD since 2007, some only since 2020, but they have made it into 13.0 at least, and all but the change to test_sshkey.c are in 12.x, too.

Merging the change for test_sshkey.c to 12-STABLE is not possible without an MFC of the _PATH_LOCALBASE definition in include/paths.h to 12-STABLE, first.

[emaste]

This review seems to lack some context ...

Yes, sorry for tagging you without the context. I'm working on updating to OpenSSH 8.6p1 in the base system by cherry-picking our local changes onto upstream openssh-portable with a goal of upstreaming changes where possible, dropping changes that are no longer necessary, or at least reviewing everything again.

My WIP tree is here: https://github.com/emaste/openssh/tree/8.6p1-FreeBSD

[se]

Not a big issue for me, but the changes in this review are all attributed to des in the GIT log for this commit:

ssh, sshd: update paths
dag-erling authored and emaste committed 3 days ago

The full commit message does mention the cherry-pick from the file I modified, but not the --author of the commit.
If this is not easily fixed (i.e. GIT does only support 1 author) then just leave it as it is ...

pathnames.h

124

In our build system I have added a definition of _PATH_SSH_ASKPASS_DEFAULT and _PATH_XAUTH to the FreeBSD Makefile.
The pathes should therefore be based on ${LOCALBASE} (or use the default of "/usr/local", ${LOCALBASE} is not defined in the context of the build).
These definitions should not affect us, therefore.
(But I do not remember whether I actually tested that these Makefile definitions are effective in the build. Guess I did ...)

regress/unittests/sshkey/test_sshkey.c

18

White space of the suggested addition needs to be fixed - I do not know how to enter a tab character via the web front-end.
The default definition could also be placed in the line below

#include <paths.h>

But I did not want to break the list of included standard headers ...

84

There will be no definition of _PATH_LOCALBASE in the upstream build environment for most architectures, I'm afraid.
I have not merged the definition of _PATH_LOCALBASE back to stable/11 or stable/12, it does only exist in stable/13 and main, for example (and not in any of the other BSDs that I know of).
Therefore, a fall-back definition should be added to provide the default value of "/usr/local".