From: Shawn Routhier <sar@isc.org>
Date: Mon, 28 Apr 2014 21:32:46 +0000 (-0700)
Subject: [master] Remove an extra set of msg_controllen
X-Git-Tag: v4_3_1b1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc48033aa181a4a5bdd34fd3efddea0a70058b31;p=thirdparty%2Fdhcp.git

[master] Remove an extra set of msg_controllen
---

diff --git a/RELNOTES b/RELNOTES
index 913f7a548..d323f2a62 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 79d0f716f..b8b44a672 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) {