aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2015-07-30 08:53:43 +0000
committerSteven Barth <steven@midlink.org>2015-07-30 08:53:43 +0000
commit6427530d52da395aa1e1b7598532d75f4d55e34e (patch)
treeb76f6a0a3abd1f1402cfa6f18f71da57d09f3518 /package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
parent4faafd5c88f33b16db1b1c492350585523d528ca (diff)
downloadmaster-187ad058-6427530d52da395aa1e1b7598532d75f4d55e34e.tar.gz
master-187ad058-6427530d52da395aa1e1b7598532d75f4d55e34e.tar.bz2
master-187ad058-6427530d52da395aa1e1b7598532d75f4d55e34e.zip
dnsmasq: Bump to dnsmasq2.74
Bump to dnsmasq2.74 & refresh patches to fix fuzz Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46522 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch')
-rw-r--r--package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
index a502a60aee..f5b5ca04ec 100644
--- a/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
+++ b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
@@ -9,7 +9,7 @@
struct iface_param parm;
#ifdef HAVE_LINUX_NETWORK
struct arpreq arp_req;
-@@ -272,11 +272,9 @@ void dhcp_packet(time_t now, int pxe_fd)
+@@ -275,11 +275,9 @@ void dhcp_packet(time_t now, int pxe_fd)
{
ifr.ifr_addr.sa_family = AF_INET;
if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 )
@@ -23,7 +23,7 @@
}
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-@@ -295,7 +293,7 @@ void dhcp_packet(time_t now, int pxe_fd)
+@@ -298,7 +296,7 @@ void dhcp_packet(time_t now, int pxe_fd)
parm.relay_local.s_addr = 0;
parm.ind = iface_index;
@@ -32,7 +32,7 @@
{
/* If we failed to match the primary address of the interface, see if we've got a --listen-address
for a secondary */
-@@ -315,6 +313,12 @@ void dhcp_packet(time_t now, int pxe_fd)
+@@ -318,6 +316,12 @@ void dhcp_packet(time_t now, int pxe_fd)
complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm);
}