[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 749488901280743642c40b6f741644556b79bbb3

[Michael Tremer <git@ipfire.org>]

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 <michael.tremer@ipfire.org>
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 <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

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