This is a diff against upstream after merging OpenSSH 10.4p1 -- git diff --diff-filter=M vendor/openssh/10.4p1 HEAD:crypto/openssh
Details
Diff Detail
- Repository
- rG FreeBSD src repository
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
| servconf.c | ||
|---|---|---|
| 253 ↗ | (On Diff #181447) | Or move the test before derelativise_path? Or, should we be checking access(rpath, ...) perhaps? |
| servconf.c | ||
|---|---|---|
| 253 ↗ | (On Diff #181447) | I'm inclined to think that we should be checking access(apath, ...) instead of moving the test before derelativise_path(). |
This looks good to me.
I tried re-creating it yesterday, and arrived at the same result (assuming SSH_VERSION_FREEBSD will be bumped upon commit).
Let me know your diff after freebsd-configure.sh and freebsd-namespace.sh, as there were a few changes there as well.
Let me know your diff after freebsd-configure.sh and freebsd-namespace.sh, as there were a few changes there as well.
I put the diff against upstream in D58128 - please check crypto/openssh/{config.h, ssh_namespace.h, version.h} and secure/lib/libssh/Makefile there.
| crypto/openssh/servconf.h | ||
|---|---|---|
| 239 | Hi Ed, sorry, while rebasing the patch for openssh-portable, I realized that this is how it was before this change. I think it should indeed be SSHCFG_GLOBAL, I don't think it can be allowed inside a Match. | |