[master] Remove an extra set of msg_controllen

diff --git a/RELNOTES b/RELNOTES
index 913f7a5480b3079a0ff5e55932588a13b9489290..d323f2a623d7a281888999428273a270eab4f7cb 100644 (file)
--- 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 79d0f716f90e202fc8250f3d0fb52b32785fc5a1..b8b44a67215e7a09a27d0d15590662b90be8df89 100644 (file)
--- 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) {