From nobody Sat Oct 25 21:20:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvCNS1PCKz6DYp7; Sat, 25 Oct 2025 21:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvCNS0kwKz3fkl; Sat, 25 Oct 2025 21:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761427224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mEDabQUtwlI5lDejqehKdWltF2DlKlkPvPmRI9p/Gi8=; b=IqenHmM2V1BjraMuiFawAc3Ysz7H+b/d8HgOJz2xHpCI3Hoa7Qw8tY6ODa0i+RKO79++EP BXYj/XVMzHktxlwe4fOrduJFpi0sn14spv5u+jWzwBSNOum2EXYlvbVx0jBO++gvL3ycF+ kGTwgtvayvn79dmN4N+76ANZqhYUrcObc6Ukr9sQGIR51i2xZ54dJbAbNHiOm5p34fm99N A8DIoZP1LINTSCS+OS48I/bv8iP76go4GKXmTbaSeByd6BrEvpI821KlAfbLNJ6ZyBHHUG FoLHg3wtXvrNgWUe/glZC60eIhW3n5NUQuSKL9olPjbrhFyda6sY9zFispKrgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761427224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mEDabQUtwlI5lDejqehKdWltF2DlKlkPvPmRI9p/Gi8=; b=peGj7umNEf6yeIAnalLrQRr1vEDagdgXf2TqX6GOgTJl3ty/u37YkxfODgy/i6DNB9nA7q 89mS8qGjj2IPQ0OKX4HpYXotvEo/nO+cAksDjbMTskOQCR5Uoz07xFvMB1exGLTZV84hLd XAjXulKWyJLGmCUKEZQGQtDZ3GtjqWvLNVAXlh0sZkqY3Rd22oNdPU2Wpu6ePJPz7sSXOq 3fVz0Fa+3OXmFZcpLgnmDPQis+MH/G6dUA83UtF6GJuZAkMS+IXrldfnth5Q6s1/i646n3 HknLmJKAjkXjJ6e2Lx7vdMpYKmRKdyq1wNVThN/x/cCJF/OZC+Jypv3XcwJTfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761427224; a=rsa-sha256; cv=none; b=uBbX2ReloeoVByx1ow1p6ShYSYPn5egeMuHAkb40Xzhqt5M9IKTUYv2vmw/iRY5IzDpoc0 lcuS5No/xNFZOyAHrhep7TeoorA2gDVe9zWXUFWSvbW/ZcSbeUn8ruCrYE6XuR6lBFZCzX 3TooHiQ/i+ojsFakblwTw2kaOWRFjIOloFlKk/BQidsqcvVh8Bi4+s6oHlFBwFhoxTCWkT eSjjefotfLvWjjluOhqkYBbUWFMPxsLZY7SoJ/ktS7/iOIBo6kPce0RaiypdwRWv7yAClv OiYtAfIrPpWnsfwH0TlN1WV06aSmgJBShUphiq/l4T+OSuhHCXm5TefMHPHAQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvCNS02mDz13Zt; Sat, 25 Oct 2025 21:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59PLKN46096155; Sat, 25 Oct 2025 21:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59PLKH5W095791; Sat, 25 Oct 2025 21:20:17 GMT (envelope-from git) Date: Sat, 25 Oct 2025 21:20:17 GMT Message-Id: <202510252120.59PLKH5W095791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: bcbe0a3c924e - main - MFV: Import blocklist 2025-10-25 (156df4f) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcbe0a3c924e09c4d78514e3d16d493e3da54f83 Auto-Submitted: auto-generated 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 AuthorDate: 2025-10-25 21:15:18 +0000 Commit: Jose Luis Duran 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) {