Date: Sat, 25 Oct 2025 21:20:17 GMT From: Jose Luis Duran <jlduran@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: bcbe0a3c924e - main - MFV: Import blocklist 2025-10-25 (156df4f) Message-ID: <202510252120.59PLKH5W095791@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=bcbe0a3c924e09c4d78514e3d16d493e3da54f83 commit bcbe0a3c924e09c4d78514e3d16d493e3da54f83 Merge: d6864221d884 1ae0b2f3a242 Author: Jose Luis Duran <jlduran@FreeBSD.org> AuthorDate: 2025-10-25 21:15:18 +0000 Commit: Jose Luis Duran <jlduran@FreeBSD.org> CommitDate: 2025-10-25 21:18:36 +0000 MFV: Import blocklist 2025-10-25 (156df4f) Merge commit '1ae0b2f3a242a48af2deef1e88649bf4a3a74e2f' Changes: https://github.com/zoulasc/blocklist/compare/8aa81bf...156df4f MFC after: 2 days contrib/blocklist/bin/blocklistctl.8 | 5 ++--- contrib/blocklist/bin/blocklistctl.c | 8 ++++---- contrib/blocklist/bin/blocklistd.c | 18 ++++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --cc contrib/blocklist/bin/blocklistd.c index 03a1dbbf056c,20bd29c7683c..c78c560613fc --- a/contrib/blocklist/bin/blocklistd.c +++ b/contrib/blocklist/bin/blocklistd.c @@@ -222,16 -222,19 +222,16 @@@ process(bl_t bl switch (bi->bi_type) { case BL_ABUSE: /* - * If the application has signaled abusive behavior, set the - * number of fails to be two less than the configured limit. - * Fall through to the normal BL_ADD and BL_BADUSER processing, - * which will increment the failure count to the threshold, and - * block the abusive address. + * If the application has signaled abusive behavior, + * set the number of fails to be one less than the + * configured limit. Fallthrough to the normal BL_ADD + * processing, which will increment the failure count - * to the threshhold, and block the abusive address. ++ * to the threshold, and block the abusive address. */ if (c.c_nfail != -1) - dbi.count = c.c_nfail - 2; + dbi.count = c.c_nfail - 1; /*FALLTHROUGH*/ case BL_ADD: - dbi.count++; /* will become += 2 */ - /*FALLTHROUGH*/ - case BL_BADUSER: dbi.count++; dbi.last = ts.tv_sec; if (c.c_nfail != -1 && dbi.count >= c.c_nfail) {help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510252120.59PLKH5W095791>