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 4gQSj74YhSz2y5m for ; Wed, 27 May 2026 11:54:51 +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 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 "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gQSj74BrXz2xMP for ; Wed, 27 May 2026 11:54:51 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [IPv6:2001:678:b28::161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bit raw public key) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4gQSj61QQmz3gb for ; Wed, 27 May 2026 11:54:50 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1779882890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Z1cGDjJJ4oA8SP5h77LSQDcHysEIWHbDLAEwKM1Ccsw=; b=h6IiAWsjFydOnu3A1CeMGS8SYqTUWtm1/Jwa3jPwVRC76S9Mf+t1M5JTEdH1j7xf3YvjwO 67IOaQeWRZ0dDsAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1779882890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Z1cGDjJJ4oA8SP5h77LSQDcHysEIWHbDLAEwKM1Ccsw=; b=fLv/GFjDddvFlRqtDEUJ1CwoXHWipHT/mFfhuhAiWsfP1HtWuDo3+ih5ce3CkfZIv/WNgt pUGGdr6U5t6DVtSyxklW4U+zDFoTtAUrAjTriGqSQHOM+EX5Up61Va+5lRf+arZ6fXU1Bk KLslg7zS6Ibkq6Q72kqZWfIOlzMZPOrZ+10vpXdHlol8Jy6Nzo4LSYL+pmzvA8Jv2LcqqC fGvwdn7VhtvPCmIGUbQ0YlhYx0kxx/RZxXSVoaiH09SvYX2MEHGM90YSTsw4Zb2DnrPY8G XizWsoIgIWVK8VKdCFgiqc5GDjj1CbRDEPQz+8NQ2dBABC9e/FQr8SmXeZbffw== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4gQSj5292mz2xKs; Wed, 27 May 2026 11:54:49 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a5b8b52cdd3610eeded4d3b06577171e464fbd7c X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: ef08f8ca36b32203d08d2a5d6d9d7850eda5bd9f X-Git-Newrev: a5b8b52cdd3610eeded4d3b06577171e464fbd7c Message-Id: <4gQSj5292mz2xKs@people01.haj.ipfire.org> Date: Wed, 27 May 2026 11:54:49 +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 a5b8b52cdd3610eeded4d3b06577171e464fbd7c (commit) via 24906d8d670a8976cfab39f2b13957b886ce4d12 (commit) via b8e5eac9925e647fa75a6ec04dcda7d7f00516f1 (commit) from ef08f8ca36b32203d08d2a5d6d9d7850eda5bd9f (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 a5b8b52cdd3610eeded4d3b06577171e464fbd7c Author: Michael Tremer Date: Wed May 27 12:39:04 2026 +0100 knot resolver: Use TCP flag to for forwarding Signed-off-by: Michael Tremer commit 24906d8d670a8976cfab39f2b13957b886ce4d12 Author: Michael Tremer Date: Wed May 27 12:23:48 2026 +0100 knot resolver: Fix indentation No functional changes. Signed-off-by: Michael Tremer commit b8e5eac9925e647fa75a6ec04dcda7d7f00516f1 Author: Michael Tremer Date: Wed May 27 12:14:45 2026 +0100 dns.cgi: Remove Unbound check if we are in recursor mode Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/knot-resolver/config.lua | 22 +++++----------------- config/knot-resolver/config.yaml | 3 --- doc/language_issues.de | 1 + doc/language_issues.en | 1 - doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 - doc/language_issues.nl | 1 - doc/language_issues.pl | 1 - doc/language_issues.ru | 1 - doc/language_issues.tr | 1 - doc/language_issues.tw | 1 + doc/language_issues.zh | 1 + html/cgi-bin/dns.cgi | 12 ------------ 14 files changed, 10 insertions(+), 38 deletions(-) Difference in files: diff --git a/config/knot-resolver/config.lua b/config/knot-resolver/config.lua index 0dddfa9ed..01bde6cff 100644 --- a/config/knot-resolver/config.lua +++ b/config/knot-resolver/config.lua @@ -136,21 +136,6 @@ local function reverse_zones(address, netmask) return zones end --- Configure transport -function config.transport() - -- Load the settings - local settings = config.load_settings("/var/ipfire/dns/settings") - - -- Force using TCP if configured - if settings["PROTO"] == "TCP" then - policy.add( - policy.all( - policy.FLAGS("TCP") - ) - ) - end -end - -- Setup DNS Forwarders function config.load_forwarders(settings) -- Fetch the transport protocol @@ -197,8 +182,11 @@ function config.load_forwarders(settings) return end + -- Use TCP? + local tcp = (settings["PROTO"] == "TCP") + -- Apply the forwarding rule - policy.rule_forward_add(".", { dnssec=true, auth=false }, forwarders) + policy.rule_forward_add(".", { dnssec=true, auth=false, tcp=tcp }, forwarders) end -- Load any hosts @@ -383,7 +371,7 @@ function config.load_leases() -- Enabled on BLUE? if settings["ENABLE_BLUE"] == "on" then - policy.add( + policy.add( policy.suffix(leases.answer(), { todname(settings["DOMAIN_NAME_BLUE"]) }) diff --git a/config/knot-resolver/config.yaml b/config/knot-resolver/config.yaml index dfc849614..1cee0df1e 100644 --- a/config/knot-resolver/config.yaml +++ b/config/knot-resolver/config.yaml @@ -45,9 +45,6 @@ lua: -- Load the settings local settings = config.load_settings("/var/ipfire/dns/settings") - -- Configure transport - config.transport() - -- Load DHCP Leases Lookup config.load_leases() diff --git a/doc/language_issues.de b/doc/language_issues.de index d8acb83f7..d8ea3d611 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -260,6 +260,7 @@ WARNING: translation string unused: dns mode for qname minimisation WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns proxy server +WARNING: translation string unused: dns recursor mode WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dnsbl acl diff --git a/doc/language_issues.en b/doc/language_issues.en index 7af708573..53d55d90a 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -614,7 +614,6 @@ WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS ser WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time. WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. -WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns servers = DNS Servers WARNING: untranslated string: dns title = Domain Name System diff --git a/doc/language_issues.es b/doc/language_issues.es index e95cc447e..d97db4fe3 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -285,6 +285,7 @@ WARNING: translation string unused: dns mode for qname minimisation WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns proxy server +WARNING: translation string unused: dns recursor mode WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dns server diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 67bdc4331..3cab8d793 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -285,6 +285,7 @@ WARNING: translation string unused: dns mode for qname minimisation WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns proxy server +WARNING: translation string unused: dns recursor mode WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dnssec disabled warning diff --git a/doc/language_issues.it b/doc/language_issues.it index bd3e5978c..0006f5f8e 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1043,7 +1043,6 @@ WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS ser WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time. WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. -WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers diff --git a/doc/language_issues.nl b/doc/language_issues.nl index cf1324f4c..c2d149c45 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1042,7 +1042,6 @@ WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS ser WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time. WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. -WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers diff --git a/doc/language_issues.pl b/doc/language_issues.pl index c0ba6cbbd..7e51a3ac8 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -998,7 +998,6 @@ WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS ser WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time. WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. -WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers diff --git a/doc/language_issues.ru b/doc/language_issues.ru index eca8e4a92..0b2947913 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -996,7 +996,6 @@ WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS ser WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time. WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. -WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 9b9b18362..01d93ba78 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1024,7 +1024,6 @@ WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS ser WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assigned DNS servers and TLS cannot be used at the same time. WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. -WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns resolver = DNS Resolver WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers diff --git a/doc/language_issues.tw b/doc/language_issues.tw index da35d5afe..a46e15f61 100644 --- a/doc/language_issues.tw +++ b/doc/language_issues.tw @@ -287,6 +287,7 @@ WARNING: translation string unused: dns mode for qname minimisation WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns proxy server +WARNING: translation string unused: dns recursor mode WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dns server diff --git a/doc/language_issues.zh b/doc/language_issues.zh index da35d5afe..a46e15f61 100644 --- a/doc/language_issues.zh +++ b/doc/language_issues.zh @@ -287,6 +287,7 @@ WARNING: translation string unused: dns mode for qname minimisation WARNING: translation string unused: dns new 0 WARNING: translation string unused: dns new 1 WARNING: translation string unused: dns proxy server +WARNING: translation string unused: dns recursor mode WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dns server diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 07d589048..ca47e89cc 100644 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -425,18 +425,10 @@ END sub show_nameservers () { &Header::openbox('100%', 'center', "$Lang::tr{'dns servers'}"); - # Determine if we are running in recursor mode - my $recursor = 0; - my $unbound_forward = qx(unbound-control forward); - if ($unbound_forward =~ m/^off/) { - $recursor = 1; - } - my $dns_status_string; my $dns_status_col; my $dns_working; - # Test if the DNS system is working. # # Simple send a request to unbound and check if it can resolve the @@ -452,10 +444,6 @@ sub show_nameservers () { $dns_status_col = "${Header::colourred}"; } - if ($recursor) { - $dns_status_string .= " (" . $Lang::tr{'dns recursor mode'} . ")"; - } - print < hooks/post-receive -- IPFire 2.x development tree