diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2020-06-15 13:44:37 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2020-06-15 13:44:37 +0000 |
| commit | e6a066ac3e8fdf1fcd4f3f2ca1b82bd55eb2da2a (patch) | |
| tree | d6a99e0065ab5d39b716a0d5272ef21055745e0c /diff/ssh.diff | |
| parent | 6fa63e1816f543db1c68320f442e30f95d8f9f78 (diff) | |
Notes
Diffstat (limited to 'diff/ssh.diff')
| -rw-r--r-- | diff/ssh.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/diff/ssh.diff b/diff/ssh.diff index 9427fc8ddb36..17300bb5dc8d 100644 --- a/diff/ssh.diff +++ b/diff/ssh.diff @@ -7,14 +7,14 @@ +#include "packet.h" +#include "log.h" +#include "pfilter.h" -+#include <blacklist.h> ++#include <blocklist.h> + -+static struct blacklist *blstate; ++static struct blocklist *blstate; + +void +pfilter_init(void) +{ -+ blstate = blacklist_open(); ++ blstate = blocklist_open(); +} + +void @@ -27,9 +27,9 @@ + return; + // XXX: 3? + fd = packet_connection_is_on_socket() ? packet_get_connection_in() : 3; -+ (void)blacklist_r(blstate, a, fd, "ssh"); ++ (void)blocklist_r(blstate, a, fd, "ssh"); + if (a == 0) { -+ blacklist_close(blstate); ++ blocklist_close(blstate); + blstate = NULL; + } +} @@ -60,8 +60,8 @@ diff -u -u -r1.10 Makefile LDADD+= -lwrap DPADD+= ${LIBWRAP} + -+LDADD+= -lblacklist -+DPADD+= ${LIBBLACKLIST} ++LDADD+= -lblocklist ++DPADD+= ${LIBBLOCKLIST} diff -ru openssh-7.7p1/auth-pam.c dist/auth-pam.c --- openssh-7.7p1/auth-pam.c 2018-04-02 01:38:28.000000000 -0400 +++ dist/auth-pam.c 2018-05-23 11:56:22.206661484 -0400 |