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 e8adbea97beb1107a48b3f804143e11ebf6228bb (commit) via 99cadb743af795134733ce2e229e53c3c0e7359b (commit) from b76118c32ceb03b40945805e42bd7514f7007f1f (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 e8adbea97beb1107a48b3f804143e11ebf6228bb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 30 13:13:46 2020 +0100
general-functions.pl: Return unique list of nameservers
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 99cadb743af795134733ce2e229e53c3c0e7359b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 30 13:07:01 2020 +0100
ids-functions.pl: Fall back to $EXTERNAL_NET for DNS servers
When no DNS servers are configured (aka recursor mode), the DNS servers that unbound will try to contact can be anywhere.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/general-functions.pl | 5 ++++- config/cfgroot/ids-functions.pl | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-)
Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 448f4c635..41a0eac2d 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -29,6 +29,9 @@ $General::adminmanualurl = 'http://wiki.ipfire.org';
require "${General::swroot}/network-functions.pl";
+# Function to remove duplicates from an array +sub uniq { my %seen; grep !$seen{$_}++, @_ } + # # log ("message") use default 'ipcop' tag # log ("tag","message") use your tag @@ -1255,7 +1258,7 @@ sub get_nameservers () { }
# Return the array. - return @nameservers; + return &uniq(@nameservers); }
1; diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl index 186c39ac7..af8a927e0 100644 --- a/config/cfgroot/ids-functions.pl +++ b/config/cfgroot/ids-functions.pl @@ -718,10 +718,7 @@ sub generate_dns_servers_file() { if (@nameservers) { $line = join(",", @nameservers); } else { - # The responsible DNS servers on red are directly used, and because we are not able - # to specify each single DNS server address here, we currently have to thread each - # address which is not part of the HOME_NET as possible DNS server. - $line = "!$HOME_NET"; + $line = "$EXTERNAL_NET"; }
# Open file to store the used DNS server addresses.
hooks/post-receive -- IPFire 2.x development tree