Page MenuHomeFreeBSD

ssh: Partial blocklistd rename
AcceptedPublic

Authored by emaste on Feb 24 2025, 3:37 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Oct 8, 12:39 PM
Unknown Object (File)
Fri, Sep 26, 8:01 PM
Unknown Object (File)
Wed, Sep 24, 6:33 PM
Unknown Object (File)
Mon, Sep 22, 12:55 PM
Unknown Object (File)
Sep 12 2025, 3:19 AM
Unknown Object (File)
Aug 22 2025, 4:10 PM
Unknown Object (File)
Aug 11 2025, 6:07 AM
Unknown Object (File)
Aug 2 2025, 10:43 AM
Subscribers

Details

Reviewers
dch
jlduran
Summary

The upstream project was renamed blocklistd. Chase the rename in ssh to go along with an upcoming vendor update, and document UseBlacklist as the backwards-compatibility alias.

(This has been sitting in my WIP tree for 1.5 years.)

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

Correct rebase errors

crypto/openssh/servconf.h
256

extra blank line presumably from rebasing, will remove

crypto/openssh/sshd_config.5
2016

This one will come with the rename itself in a future commit

While this is perfect, I fear this could make automated changes more difficult.
This is our current diff once the latest changes from upstream are pulled in:
https://github.com/jlduran/freebsd-src/pull/104
The shell script in the GitHub pull request is very straightforward. Perhaps we could include it as part of a FreeBSD-upgrade guide.
The main problem with this change is that it is an API change (OK for 15, but not for the rest).

Also missing:

  • libexec/ftpd/blacklist_client.hlibexec/ftpd/blacklist_client.h
  • libexec/ftpd/ftpd.c

Sorry, I just realized this is just for openssh.

Sorry for the confusion. This is a step forward in the naming transition. Thank you!

This revision is now accepted and ready to land.Feb 24 2025, 7:03 PM
crypto/openssh/auth-pam.c
940

Somewhat related, passing NULL as the first parameter does nothing (ssh_packet_connection_is_on_socket(NULL);). Given BLOCKLIST_BAD_USER has been implemented upstream.