Fix unresponsible DHCP

This commit is contained in:
Petr Menšík 2017-05-12 16:23:10 +02:00
parent 389f40bfd5
commit a26c714178
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 7ab78b937fc1b98a1e47a63b2cc1f8451cd7c5fa Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Thu, 11 May 2017 20:33:21 +0100
Subject: [PATCH] Fix c7be0164ce6ae89d6f2f0ffea14e2612418dd5da
---
src/dhcp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/dhcp.c b/src/dhcp.c
index 232e344..f995f0e 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -224,7 +224,7 @@ void dhcp_packet(time_t now, int pxe_fd)
#endif
if (!indextoname(daemon->dhcpfd, iface_index, ifr.ifr_name) ||
- ioctl(daemon->dhcpfd, SIOCGIFFLAGS, &ifr) != -1)
+ ioctl(daemon->dhcpfd, SIOCGIFFLAGS, &ifr) != 0)
return;
mess = (struct dhcp_packet *)daemon->dhcp_packet.iov_base;
--
2.9.3

View File

@ -13,7 +13,7 @@
Name: dnsmasq Name: dnsmasq
Version: 2.77 Version: 2.77
Release: 1%{?extraversion:.%{extraversion}}%{?dist} Release: 2%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons Group: System Environment/Daemons
@ -22,6 +22,8 @@ URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.xz Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.xz
Source1: %{name}.service Source1: %{name}.service
Patch1: dnsmasq-2.77rc3-fix-dhcp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel BuildRequires: dbus-devel
@ -55,6 +57,7 @@ query/remove a DHCP server's leases.
%prep %prep
%setup -q -n %{name}-%{version}%{?extraversion} %setup -q -n %{name}-%{version}%{?extraversion}
%patch1 -p1
# 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
@ -140,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/dhcp_* %{_mandir}/man1/dhcp_*
%changelog %changelog
* Fri May 12 2017 Petr Menšík <pemensik@redhat.com> - 2.77-2.rc2
- Fix dhcp
* Thu May 11 2017 Petr Menšík <pemensik@redhat.com> - 2.77-1 * Thu May 11 2017 Petr Menšík <pemensik@redhat.com> - 2.77-1
- Update to 2.77rc2 - Update to 2.77rc2