mmits-src-main@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 4cwH5t0R7Vz6Dq81; Mon, 27 Oct 2025 15:11:30 +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 4cwH5s6nWyz3rgl; Mon, 27 Oct 2025 15:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761577890; 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=0fzQA1zV63r3AHHJe70DXEX4yvq8d0vQDdscumPLKwk=; b=Ak69ydoSaVPY7j3uvt0ID23kpFSyOdoez57AqndmsNWE4TwU5nHHRCkx/DUgwjWU36b9Tr QSSM/O2Ze5gEA+TUBe50PkLKEcQ1moKrW9O43ymj1pMdC6rZkaPe5z/7GG55vsIaJiacBn kItYA2UHY0Cd9EKkibWO7S7W+x4TrciKGDk2keF1Urhll9YbcFwn+ci0IaVXLVm68mDEDJ Mu9g5zzzojFVNR5BC/9lafMwH2ccIyTtKN0rKPNmmwcnEmfvQ+5/C9gFtk03BmxGWO1HmZ 96tQdZ2kx3/Ln9zVv1oeSDsnyMQifhYQzPftEwdTZWJoDNEWSGcGuNbpIHK/Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761577890; 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=0fzQA1zV63r3AHHJe70DXEX4yvq8d0vQDdscumPLKwk=; b=jNzr/RnRUCOM8Czcen/d46ZVXwIYffNI5j+ofnbo9y/ivptJCxNT1HAyWzQje7klnkvh3c NDlfE4cSnbtNhQYOknzuMJaJwYUyrut247qEtUEeihFzE1PPo4EiO5IFSLf0BstrrfCopm g83PD0jGaiwCfiM/iv40JZGUCo8v75/2wNAD4eNnh44KUFvoc+LKF2eG+Rb/L+RSmhITRJ R9sG1EChBdGKa8RE3/gll0B1teTBwRhOJpd3upfHRv6gt8GVH8CtX6uX4h/TWQ86fPd0nz o8ct6npAUtVjQDr6U7ZcyvADjLlQFwOMRW6iCEPDY7SLqoub8B9HCPP+H18SZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761577890; a=rsa-sha256; cv=none; b=PGXeswHlPjM7GiV9HTf5UH7aVNFJVxCfhZbhy38BpO7lPGshs6RyM6Mzw7wpeW14Ai//TW oRP69WvKVO00douyb+j8zMFBCdZGPs7ZYXRWrcLtuZws1CnoFqU7/5R0GxIT4vW2zBx1oV ugJELGoc6eq08ksbY6UAT9bquXYNEtjZHMFk/AG8bkCA+cgcjtTqDAe8dsy9K0lkmxhyv0 zFaA9yKJknoQydAHaP79uihZeGzHt2RPv/EZsTN+7v7A8M8nkt90dUfmTCfcspeaRXyeOz Rn6IDqGC/Z+zmgjvuwF2RwurI6FEaii17T89bQ+D7AJYl0E+dU08OInq0KeP2Q== 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 4cwH5s6MQKz1Lxs; Mon, 27 Oct 2025 15:11:29 +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 59RFBTGp032417; Mon, 27 Oct 2025 15:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RFBTFS032414; Mon, 27 Oct 2025 15:11:29 GMT (envelope-from git) Date: Mon, 27 Oct 2025 15:11:29 GMT Message-Id: <202510271511.59RFBTFS032414@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: b502a451cbae - main - blocklist: blacklist: Chase recent upstream changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b502a451cbae6a85636c7b8375f5ee53caca4388 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=b502a451cbae6a85636c7b8375f5ee53caca4388 commit b502a451cbae6a85636c7b8375f5ee53caca4388 Author: Jose Luis Duran AuthorDate: 2025-10-27 15:01:22 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-27 15:10:59 +0000 blocklist: blacklist: Chase recent upstream changes Upstream introduced a fix that avoids blocklistd(8) from running into an endless loop when it tries to delete an address from the database which has been added multiple times. Apply the same fix to blacklistd(8). Upstream PR: https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=57193 MFC after: 2 days --- contrib/blocklist/bin/blacklistd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/blocklist/bin/blacklistd.c b/contrib/blocklist/bin/blacklistd.c index b5f9358122ef..cb6ce6578d9c 100644 --- a/contrib/blocklist/bin/blacklistd.c +++ b/contrib/blocklist/bin/blacklistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $ */ +/* $NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #ifdef HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $"); +__RCSID("$NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $"); #include #include @@ -329,8 +329,8 @@ again: (*lfun)(LOG_INFO, "released %s/%d:%d after %d seconds", buf, c.c_lmask, c.c_port, c.c_duration); } - state_del(state, &c); - goto again; + if (state_del(state, &c) == 0) + goto again; } }