diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2019-03-09 08:40:57 +0000 |
|---|---|---|
| committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2019-07-25 12:23:46 +0100 |
| commit | e9eec39aacde450ba87598d85987b374ce6aed95 (patch) | |
| tree | 3823546edc4d7228951ea9e37f55f6fea3f06833 /package/network/services/dnsmasq/patches/0049-Apply-fix-from-c6cc455dd191fbea56ee14a0ef88a7d655a6f.patch | |
| parent | 7d684b7673a7cb4f3fef366dd4f621f62fc4019c (diff) | |
| download | upstream-e9eec39aacde450ba87598d85987b374ce6aed95.tar.gz upstream-e9eec39aacde450ba87598d85987b374ce6aed95.tar.bz2 upstream-e9eec39aacde450ba87598d85987b374ce6aed95.zip | |
dnsmasq: backport latest patches
Backport upstream patches pre 2.81rc for testing purposes.
Let's see what falls out!
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/0049-Apply-fix-from-c6cc455dd191fbea56ee14a0ef88a7d655a6f.patch')
| -rw-r--r-- | package/network/services/dnsmasq/patches/0049-Apply-fix-from-c6cc455dd191fbea56ee14a0ef88a7d655a6f.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/patches/0049-Apply-fix-from-c6cc455dd191fbea56ee14a0ef88a7d655a6f.patch b/package/network/services/dnsmasq/patches/0049-Apply-fix-from-c6cc455dd191fbea56ee14a0ef88a7d655a6f.patch new file mode 100644 index 0000000000..4ddd305192 --- /dev/null +++ b/package/network/services/dnsmasq/patches/0049-Apply-fix-from-c6cc455dd191fbea56ee14a0ef88a7d655a6f.patch @@ -0,0 +1,23 @@ +From 7673013d2323834b555052ddbd87381bb5cd7bac Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Thu, 28 Mar 2019 22:04:10 +0000 +Subject: [PATCH 49/57] Apply fix from c6cc455dd191fbea56ee14a0ef88a7d655a6fe9a + in DHCP code. + +Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> +--- + src/dhcp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -401,7 +401,8 @@ void dhcp_packet(time_t now, int pxe_fd) + pkt = (struct in_pktinfo *)CMSG_DATA(cmptr); + pkt->ipi_ifindex = rcvd_iface_index; + pkt->ipi_spec_dst.s_addr = 0; +- msg.msg_controllen = cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo)); ++ msg.msg_controllen = CMSG_SPACE(sizeof(struct in_pktinfo)); ++ cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo)); + cmptr->cmsg_level = IPPROTO_IP; + cmptr->cmsg_type = IP_PKTINFO; + |