From f7ebb917a7e5221272a4eb74be3f764eb7a3ea89 Mon Sep 17 00:00:00 2001 From: Shawn Routhier Date: Mon, 28 Apr 2014 14:32:46 -0700 Subject: [PATCH] [v4_1_esv] Remove an extra set of msg_controllen --- RELNOTES | 5 ++++- common/socket.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RELNOTES b/RELNOTES index cbd36c384..c418eefe4 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,5 +1,5 @@ Internet Systems Consortium DHCP Distribution - Version 4.1-ESV-R9 + Version 4.1-ESV-R10-pre-beta 3 February 2014 Release Notes @@ -71,6 +71,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.1-ESV-R9rc1 - None diff --git a/common/socket.c b/common/socket.c index eecedbeaf..db10db08a 100644 --- a/common/socket.c +++ b/common/socket.c @@ -813,7 +813,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) { -- 2.47.3