This is a diff between stock OpenSSH-portable 8.0p1 and the result of merging same to crypto/openssh and attempting to resolve conflicts. There are a few issues to be addressed still.
Details
Details
- Reviewers
- None
Diff Detail
Diff Detail
- Lint
Lint Skipped - Unit
Tests Skipped
Event Timeline
| crypto/openssh/FREEBSD-upgrade | ||
|---|---|---|
| 98 | Going through this effort also highlighted that some updates are necessary here. | |
| crypto/openssh/FREEBSD-vendor | ||
| 4 | This will need to be updated | |
| crypto/openssh/auth-pam.c | ||
| 904–905 | We do not have ssh context here. | |
| crypto/openssh/auth.c | ||
| 608 | https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=37416 This change should really be made upstream, although I think OpenBSD may not have login_getpwclass so we will need an autoconf test and then something like #ifdef HAVE_LOGIN_GETPWCLASS
if ((lc = login_getpwclass(pw)) == NULL) {
#else
if ((lc = login_getclass(pw->pw_class)) == NULL) {
#endif | |
| crypto/openssh/mux.c | ||
| 21 | ought to drop these | |
| crypto/openssh/myproposal.h | ||
| 120–121 | hmm | |
| crypto/openssh/sandbox-capsicum.c | ||
| 75 | bugfix to be upstreamed | |
| crypto/openssh/servconf.c | ||
| 293–294 | hmm | |
| 306–307 | this seems like a reasonable fix for upstream? | |
| crypto/openssh/version.h | ||
| 9 | needs to be updated | |
| crypto/openssh/FREEBSD-vendor | ||
|---|---|---|
| 4 | Fixed in local tree for D29985 | |
| crypto/openssh/auth.c | ||
| 608 | login_getpwclass now upstream | |
| crypto/openssh/mux.c | ||
| 21 | Keeping them for now for the benefit of stable/11 and stable/12 which are still being updated via svn. Will remove in the future. | |
| crypto/openssh/myproposal.h | ||
| 120–121 | no longer present | |