From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH] IDS: Add GREEN and BLUE addresses to the list of DNS servers.
Date: Sun, 05 Apr 2020 09:51:18 +0200
Message-ID: <53179398-67e3-b759-8492-c3b76846fa29@ipfire.org>
In-Reply-To: <20200403145912.9808-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0973942430505269110=="
List-Id: <development.lists.ipfire.org>

--===============0973942430505269110==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>

> Fixes #12349.
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>  config/cfgroot/ids-functions.pl | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>=20
> diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions=
.pl
> index 5bc3e77ec..f124b12be 100644
> --- a/config/cfgroot/ids-functions.pl
> +++ b/config/cfgroot/ids-functions.pl
> @@ -718,13 +718,28 @@ sub generate_dns_servers_file() {
>  	# Get the used DNS servers.
>  	my @nameservers =3D &General::get_nameservers();
> =20
> +	# Get network settings.
> +	my %netsettings;
> +	&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
> +
>  	# Format dns servers declaration.
>  	my $line =3D "";
> =20
>  	# Check if the system has configured nameservers.
>  	if (@nameservers) {
> +		# Add the GREEN address as DNS servers.
> +		push(@nameservers, $netsettings{'GREEN_ADDRESS'});
> +
> +		# Check if a BLUE zone exists.
> +		if ($netsettings{'BLUE_ADDRESS'}) {
> +			# Add the BLUE address to the array of nameservers.
> +			push(@nameservers, $netsettings{'BLUE_ADDRESS'});
> +		}
> +
> +		# Generate the line which will be written to the DNS servers file.
>  		$line =3D join(",", @nameservers);
>  	} else {
> +		# External net simply contains (any).
>  		$line =3D "\$EXTERNAL_NET";
>  	}
> =20
>=20

--===============0973942430505269110==--