import dnsmasq-2.79-11.el8_2.1
This commit is contained in:
parent
5f66d95f20
commit
b329adf800
62
SOURCES/dnsmasq-2.81-rh1829448.patch
Normal file
62
SOURCES/dnsmasq-2.81-rh1829448.patch
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
From 3d113137fd64cd0723cbecab6a36a75d3ecfb0a6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
|
||||||
|
Date: Thu, 7 May 2020 00:33:54 +0200
|
||||||
|
Subject: [PATCH 1/1] Fix regression in s_config_in_context() method
|
||||||
|
|
||||||
|
Prior to commit 137286e9baecf6a3ba97722ef1b49c851b531810
|
||||||
|
a config would not be considered in context if:
|
||||||
|
a) it has no address family flags set
|
||||||
|
b) it has the address family flag of current context set
|
||||||
|
|
||||||
|
Since above commit config is considered in context if the
|
||||||
|
address family is the opposite of current context.
|
||||||
|
|
||||||
|
The result is that a config with two dhcp-host records,
|
||||||
|
one for IPv6 and another for IPv4 no longer works, for
|
||||||
|
example with the below config the config with the IPv6
|
||||||
|
address would be considered in context for a DHCP(v4)
|
||||||
|
request.
|
||||||
|
dhcp-host=52:54:00:bc:c3:fd,172.20.0.11,host2
|
||||||
|
dhcp-host=52:54:00:bc:c3:fd,[fd12:3456:789a:1::aadd],host2
|
||||||
|
|
||||||
|
This commit restores the previous behavior.
|
||||||
|
---
|
||||||
|
src/dhcp-common.c | 10 +++++++---
|
||||||
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/dhcp-common.c b/src/dhcp-common.c
|
||||||
|
index eae9886..ffc78ca 100644
|
||||||
|
--- a/src/dhcp-common.c
|
||||||
|
+++ b/src/dhcp-common.c
|
||||||
|
@@ -280,14 +280,18 @@ static int is_config_in_context(struct dhcp_context *context, struct dhcp_config
|
||||||
|
{
|
||||||
|
if (!context) /* called via find_config() from lease_update_from_configs() */
|
||||||
|
return 1;
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+ /* No address present in config == in context */
|
||||||
|
+ if (!(config->flags & (CONFIG_ADDR | CONFIG_ADDR6)))
|
||||||
|
+ return 1;
|
||||||
|
+
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
if (context->flags & CONTEXT_V6)
|
||||||
|
{
|
||||||
|
struct addrlist *addr_list;
|
||||||
|
|
||||||
|
if (!(config->flags & CONFIG_ADDR6))
|
||||||
|
- return 1;
|
||||||
|
+ return 0;
|
||||||
|
|
||||||
|
for (; context; context = context->current)
|
||||||
|
for (addr_list = config->addr6; addr_list; addr_list = addr_list->next)
|
||||||
|
@@ -303,7 +307,7 @@ static int is_config_in_context(struct dhcp_context *context, struct dhcp_config
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if (!(config->flags & CONFIG_ADDR))
|
||||||
|
- return 1;
|
||||||
|
+ return 0;
|
||||||
|
|
||||||
|
for (; context; context = context->current)
|
||||||
|
if ((config->flags & CONFIG_ADDR) && is_same_net(config->addr, context->start, context->netmask))
|
||||||
|
--
|
||||||
|
2.25.4
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
Name: dnsmasq
|
Name: dnsmasq
|
||||||
Version: 2.79
|
Version: 2.79
|
||||||
Release: 11%{?extraversion:.%{extraversion}}%{?dist}
|
Release: 11%{?extraversion:.%{extraversion}}%{?dist}.1
|
||||||
Summary: A lightweight DHCP/caching DNS server
|
Summary: A lightweight DHCP/caching DNS server
|
||||||
|
|
||||||
License: GPLv2 or GPLv3
|
License: GPLv2 or GPLv3
|
||||||
@ -50,6 +50,7 @@ Patch17: dnsmasq-2.81-prefix-ranges-or-list-of-ipv6-addresses.patch
|
|||||||
# http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=52ec7836139e7a11374971905e5ac0d2d02e32c0
|
# http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=52ec7836139e7a11374971905e5ac0d2d02e32c0
|
||||||
Patch18: dnsmasq-2.81-tag-filtering-of-dhcp-host-directives.patch
|
Patch18: dnsmasq-2.81-tag-filtering-of-dhcp-host-directives.patch
|
||||||
Patch19: dnsmasq-2.81-correct-range-check-of-dhcp-host-prefix.patch
|
Patch19: dnsmasq-2.81-correct-range-check-of-dhcp-host-prefix.patch
|
||||||
|
Patch20: dnsmasq-2.81-rh1829448.patch
|
||||||
|
|
||||||
# This is workaround to nettle bug #1549190
|
# This is workaround to nettle bug #1549190
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1549190
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1549190
|
||||||
@ -102,6 +103,7 @@ server's leases.
|
|||||||
%patch17 -p1 -b .rh1779187-2
|
%patch17 -p1 -b .rh1779187-2
|
||||||
%patch18 -p1 -b .rh1779187-3
|
%patch18 -p1 -b .rh1779187-3
|
||||||
%patch19 -p1 -b .rh1779187-4
|
%patch19 -p1 -b .rh1779187-4
|
||||||
|
%patch20 -p1 -b .rh1829448
|
||||||
|
|
||||||
# use /var/lib/dnsmasq instead of /var/lib/misc
|
# use /var/lib/dnsmasq instead of /var/lib/misc
|
||||||
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
|
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
|
||||||
@ -202,6 +204,9 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/dnsmasq.conf
|
|||||||
%{_mandir}/man1/dhcp_*
|
%{_mandir}/man1/dhcp_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 18 2020 Petr Menšík <pemensik@redhat.com> - 2.79-11.1
|
||||||
|
- Fix mixed address family reservations on DHCP (#1829448)
|
||||||
|
|
||||||
* Mon Mar 02 2020 Petr Menšík <pemensik@redhat.com> - 2.79-11
|
* Mon Mar 02 2020 Petr Menšík <pemensik@redhat.com> - 2.79-11
|
||||||
- Support multiple static leases for single mac on IPv6 (#1779187)
|
- Support multiple static leases for single mac on IPv6 (#1779187)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user