From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH] unbound-dhcp-leases-bridge: Fall back to the default domain
Date: Tue, 04 Oct 2022 15:44:09 +0200
Message-ID: <80a05624-4d19-1a34-876e-05534d23b646@ipfire.org>
In-Reply-To: <20221004133247.3915028-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4364927538141627907=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 04.10.2022 um 15:32 schrieb Michael Tremer:
> When the bridge cannot detect a domain name for any of the leases, it
> uses localdomain which is not always the best choice. So instead, this
> patches changes the behaviour that we read the default domain of the
> firewall.
>=20
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   config/unbound/unbound-dhcp-leases-bridge | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>=20
> diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unb=
ound-dhcp-leases-bridge
> index 1446c88df..e89e0446b 100644
> --- a/config/unbound/unbound-dhcp-leases-bridge
> +++ b/config/unbound/unbound-dhcp-leases-bridge
> @@ -441,8 +441,11 @@ class Lease(object):
>   			if address in subnet:
>   				return subnets[subnet]
>  =20
> -		# Fall back to localdomain if no match could be found
> -		return "localdomain"
> +		# Load main settings
> +		settings =3D self.read_settings("/var/ipfire/main/settings")
> +
> +		# Fall back to the host domain if no match could be found
> +		return settings.get("DOMAINNAME", "localdomain")
>  =20
>   	@staticmethod
>   	@functools.cache

--===============4364927538141627907==--