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 4jGK8N04t4z2yVK for ; Fri, 30 Oct 2026 11:47:16 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "YR1" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4jGK8M6rW7z2y0G for ; Fri, 30 Oct 2026 11:47:15 +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 4jGK8M31m4z14q for ; Fri, 30 Oct 2026 11:47:15 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1793360835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=/vQwa499xQM6H9lxlsWUy4tZTLPKTsDPt5Qp9kZjBCk=; b=jSU21THNiP7zeSBWngqEXeMcwChcrLaDLeNm+nRCKRheU+Uhh2OOwD/PICdtV0DHAHeR6E Pj6oq0PP+Wfi04DA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1793360835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=/vQwa499xQM6H9lxlsWUy4tZTLPKTsDPt5Qp9kZjBCk=; b=rcYYbEFkMG7kc3eQPIbNr5r/GCPSf1KiREOC+qxTAnoVwark4PYVlL+r/OqNUYs0R4jZQJ KS4kD7m9AHVi1oWR/v770aI10AUpKXCSQx+rSQMqm/X1ItsofuePbz/vlBY8jsv7qtcpks KGfiW9jElBeRBzOMO4cRuREfX6hUuAmn0/ttxUqaTualjlMBBb9oAECBDSDSZ/JWpXWnES pcXXNarvqgM8gVVmgosBRzyLnXXn0S5Xq7GUTixAIlj4OxNhRVV7gYYCifQWjl0kuB9kxb 0V+/zed/VGspynsyuZmpUhbsAN+Ak+eoe7KSXboR1QfyTIQbXThSDTO6JdX/DQ== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4jGK8M2GScz2y3W; Fri, 30 Oct 2026 11:47:15 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a579d5e7fd1ef23523259fbcf2560e12846516d4 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7d93a465862e5b87d0de299053f27dc1e79f77b6 X-Git-Newrev: a579d5e7fd1ef23523259fbcf2560e12846516d4 Message-Id: <4jGK8M2GScz2y3W@people01.haj.ipfire.org> Date: Fri, 30 Oct 2026 11:47:15 +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, master has been updated via a579d5e7fd1ef23523259fbcf2560e12846516d4 (commit) from 7d93a465862e5b87d0de299053f27dc1e79f77b6 (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 a579d5e7fd1ef23523259fbcf2560e12846516d4 Author: Michael Tremer Date: Fri Oct 30 11:41:23 2026 +0000 knot-resolver: Load the hints module again to resolve static hosts The hints module is not loaded by default in Knot Resolver 6, and the YAML migration dropped the line that loaded it. As a result, hosts from the hosts page did not resolve. Load the module again, clear any previous hints and wrap hints.set() in a rules transaction as hints.set() requires one. Signed-off-by: Michael Tremer (cherry picked from commit bf5b42f81313faf3f365768000e412c626cfe218) ----------------------------------------------------------------------- Summary of changes: config/knot-resolver/config.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) Difference in files: diff --git a/config/knot-resolver/config.lua b/config/knot-resolver/config.lua index e640c593f..21ac063c7 100644 --- a/config/knot-resolver/config.lua +++ b/config/knot-resolver/config.lua @@ -245,6 +245,12 @@ function config.load_hosts() -- Log action log_debug(ffi.C.LOG_GRP_HINT, string.format("Loading hosts from %s", path)) + -- Load the hints module (it is not loaded by default in Knot Resolver 6) + modules.load("hints > iterate") + + -- Clear any previously registered hints + hints.config() + -- Load /etc/hosts hints.add_hosts("/etc/hosts") @@ -254,6 +260,12 @@ 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) @@ -273,6 +285,9 @@ function config.load_hosts() hints.set(hint) end end + + -- Commit the transaction + ffi.C.kr_rules_commit(true) end local GOOGLE_TLDS = { hooks/post-receive -- IPFire 2.x development tree