RC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766457051; 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=ZunleqZeeOwXZQq6Lhu8peTqC00I2Tx4ZUy7jbgFc2w=; b=tJ6bTbLY9Vxqz417afbtuEN+ngjMkbCOTXp9xo5yR1+x7/91/l/+n27NhW34t/lvm2DbzP hyBy15QU6bSpNSOfLZj4kXTY6S+Rhi60d9G2x+5pISzfp9+Jy1PVULffSuOiuypEXUZvZm gyId/AjikkPFQggKWItkPYJNiFw1L5d+8vve50y2ss1q8XJpHygw5z/k8hZlVPZsuiAnvD Gjpz+go5WGCB+XtAY9WR5Eo5JgaXIPrB7fjR+lj+4dePrw+tpsosMZBicc+lgdOy0r2ZZp jT3T/ea7iSRqhcQVQc/QAN5vKeCt9rJ9Pgx/+wAke9T6KF3Q/KGZURngVvNClQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766457051; a=rsa-sha256; cv=none; b=taLip9E0QlD5jJa/zuOV+4fUXq7VPiBWmfdPqYeD/ErF+a3Mj89XCEKAZfauziA1VE5Y8E zaMcF9MVsrL8HPCN/apiEoD+D1rmySMJo7ANDnA1lF7lFciYCXnqj4VerQFCSA01JNOTg/ gYnijrWjDw6vGjSfG7nXKmPwzMpU16Fvvfz0/KKmTZ5Ec+lD8BKR1NUBDv5sdowZDkYzuj QT+dYdlGy1+aTb4W/5FeWO9IQN7lVmCx+vfCs0qAC3GT8w6mjYm0ps8xeTpG3E/dtzfFv2 a6lAwDWuLoPeA5KItslDMRwf0inST5RpkGQnvO62codfXcTtr8slfY/J/RlWwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dZzWv0nW1zsxW for ; Tue, 23 Dec 2025 02:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e51f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 02:30:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 749293292aea - stable/15 - MFV: Import blocklist 2025-12-15 (8a4b011) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 749293292aea9387de68dad931fe757209b66048 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 02:30:51 +0000 Message-Id: <6949fedb.3e51f.59f09808@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=749293292aea9387de68dad931fe757209b66048 commit 749293292aea9387de68dad931fe757209b66048 Author: Jose Luis Duran AuthorDate: 2025-12-16 01:03:30 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-23 02:30:03 +0000 MFV: Import blocklist 2025-12-15 (8a4b011) Merge commit 'bfef098f924950a085927b1e7dd6c6db4e651c5c' Changes: https://github.com/zoulasc/blocklist/compare/ff13526...8a4b011 PR: 258411 PR: 291680 MFC after: 1 week (cherry picked from commit 52395203f9ac40d321ed55d93e9887300261d3bf) --- contrib/blocklist/bin/blocklistd.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/contrib/blocklist/bin/blocklistd.c b/contrib/blocklist/bin/blocklistd.c index 47c145c7aae1..7bbb03c0cc41 100644 --- a/contrib/blocklist/bin/blocklistd.c +++ b/contrib/blocklist/bin/blocklistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $ */ +/* $NetBSD: blocklistd.c,v 1.14 2025/12/15 15:51:37 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.12 2025/10/25 18:43:51 christos Exp $"); +__RCSID("$NetBSD: blocklistd.c,v 1.14 2025/12/15 15:51:37 christos Exp $"); #include #include @@ -191,12 +191,13 @@ process(bl_t bl) } if (getremoteaddress(bi, &rss, &rsl) == -1) - return; + goto out; if (debug || bi->bi_msg[0]) { sockaddr_snprintf(rbuf, sizeof(rbuf), "%a:%p", (void *)&rss); (*lfun)(bi->bi_msg[0] ? LOG_INFO : LOG_DEBUG, - "processing type=%d fd=%d remote=%s msg=\"%s\" uid=%lu gid=%lu", + "processing type=%d fd=%d remote=%s msg=\"%s\" " + "uid=%lu gid=%lu", bi->bi_type, bi->bi_fd, rbuf, bi->bi_msg, (unsigned long)bi->bi_uid, (unsigned long)bi->bi_gid); @@ -204,12 +205,12 @@ process(bl_t bl) if (conf_find(bi->bi_fd, bi->bi_uid, &rss, &c) == NULL) { (*lfun)(LOG_DEBUG, "no rule matched"); - return; + goto out; } if (state_get(state, &c, &dbi) == -1) - return; + goto out; if (debug) { char b1[128], b2[128]; @@ -269,6 +270,8 @@ process(bl_t bl) state_put(state, &c, &dbi); out: + close(bi->bi_fd); + if (debug) { char b1[128], b2[128]; (*lfun)(LOG_DEBUG, "%s: final db state for %s: count=%d/%d " @@ -541,15 +544,16 @@ main(int argc, char *argv[]) state = state_open(dbfile, flags, 0600); if (state == NULL) state = state_open(dbfile, flags | O_CREAT, 0600); + else { + if (restore) { + if (!flush) + rules_flush(); + rules_restore(); + } + } if (state == NULL) return EXIT_FAILURE; - if (restore) { - if (!flush) - rules_flush(); - rules_restore(); - } - if (!debug) { if (daemon(0, 0) == -1) err(EXIT_FAILURE, "daemon failed"); @@ -563,7 +567,7 @@ main(int argc, char *argv[]) conf_parse(configfile); } ret = poll(pfd, (nfds_t)nfd, tout); - if (debug && ret != 0) + if (debug) (*lfun)(LOG_DEBUG, "received %d from poll()", ret); switch (ret) { case -1: