From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4jGN2d5lmQz2yVK for ; Fri, 30 Oct 2026 13:57:29 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "YR1" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4jGN2d5XHLz2xP7 for ; Fri, 30 Oct 2026 13:57:29 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "people01.haj.ipfire.org", Issuer "YE1" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4jGN2d1zCqzvF for ; Fri, 30 Oct 2026 13:57:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1793368649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=kMxVxtI1YQtv9FJpzFfRfABFeEmopfqA+3jxWXGQPa0=; b=c3wdhKmZRF88yt2XAFiyfrxgNFxvR/Teb9JsdPPWNfBXGqrzt12HDgCBxgZhGg/IM7edQL TbU1D+BhC0I6nCCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1793368649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=kMxVxtI1YQtv9FJpzFfRfABFeEmopfqA+3jxWXGQPa0=; b=OeC1kS2DNqdAjwHtSDrVQwWddou5ZrmuJcw2N+8n5PANnVbZw7+SufjtQeCa7qCprlQh6K tTo8ClIRKjBtec3Ex9pg7gTvBCQJCviq0aiCqxdOag25DLCQAhdKlPoSzwVyJNC90E4wlP CX+NVU/hcUkocMlsK08gSkrvH4/tt/n2xs6LH7+hb3fRsValICgDbFTzUnQcvZQeNyzjme 1V4yCpxaC8ef9mr2HS/SWznKokZ2eObSBb9QUbYh8RKNZ2IalNw8craK0xi7fpdinZE0AT FKZA5gvm1zyYTIhkB1ayqI8kWm8ZZSvftC+QKlX/q7TgCfrFWHvu16Qdd3aVHw== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4jGN2d1QDbz2y3W; Fri, 30 Oct 2026 13:57:29 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 749488901280743642c40b6f741644556b79bbb3 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: bf71d529c850e4c71f8199f2f3839ded7bbbec79 X-Git-Newrev: 749488901280743642c40b6f741644556b79bbb3 Message-Id: <4jGN2d1QDbz2y3W@people01.haj.ipfire.org> Date: Fri, 30 Oct 2026 13:57:29 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 749488901280743642c40b6f741644556b79bbb3 (commit) from bf71d529c850e4c71f8199f2f3839ded7bbbec79 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 749488901280743642c40b6f741644556b79bbb3 Author: Michael Tremer Date: Fri Oct 30 13:57:28 2026 +0000 knot-resolver: Do not discard the cleared rule database when loading hosts The merge of master kept the explicit transaction in load_hosts() as next carries the same hints change under a different commit. Remove it here as well to match master (see f068a2f0ad). Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/knot-resolver/config.lua | 6 ------ 1 file changed, 6 deletions(-) Difference in files: diff --git a/config/knot-resolver/config.lua b/config/knot-resolver/config.lua index 9dcc7bd9d..2ee8a0519 100644 --- a/config/knot-resolver/config.lua +++ b/config/knot-resolver/config.lua @@ -286,12 +286,6 @@ function config.load_hosts() -- Open the file local f = csv.open(path, { separator = "," }) - -- Start a new transaction - -- This is needed to make hints.set() not crash the entire process as it - -- calls kr_rule_local_data_merge() which requires to be called inside - -- a transaction. - ffi.C.kr_rules_commit(false) - for fields in f:lines() do local status, address, hostname, domainname, ptr = unpack(fields) hooks/post-receive -- IPFire 2.x development tree