summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Routhier <sar@isc.org>2014-04-28 14:32:46 -0700
committerShawn Routhier <sar@isc.org>2014-04-28 14:32:46 -0700
commitfc48033aa181a4a5bdd34fd3efddea0a70058b31 (patch)
treea4010b0459cb8ea45e03f22840213e1ed4066368
parent38c4774a4324a16f0a9f39950700699949acb362 (diff)
downloadisc-dhcp-fc48033aa181a4a5bdd34fd3efddea0a70058b31.tar.gz
[master] Remove an extra set of msg_controllen
-rw-r--r--RELNOTES3
-rw-r--r--common/socket.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/RELNOTES b/RELNOTES
index 913f7a54..d323f2a6 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -66,6 +66,9 @@ by Eric Young (eay@cryptsoft.com).
Increase the size of the buffer used for reading interface information.
[ISC-Bugs #34858]
+- Remove an extra set of the msg_controllen variable.
+ [ISC-Bugs #21035]
+
Changes since 4.3.0rc1
- None
diff --git a/common/socket.c b/common/socket.c
index 79d0f716..b8b44a67 100644
--- a/common/socket.c
+++ b/common/socket.c
@@ -819,7 +819,6 @@ ssize_t send_packet6(struct interface_info *interface,
pktinfo = (struct in6_pktinfo *)CMSG_DATA(cmsg);
memset(pktinfo, 0, sizeof(*pktinfo));
pktinfo->ipi6_ifindex = ifindex;
- m.msg_controllen = cmsg->cmsg_len;
result = sendmsg(interface->wfdesc, &m, 0);
if (result < 0) {