From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 8 Jun 2016 06:31:10 +0000 (+0000)
Subject: not sure why valgrind needed this - it is redundant but in this case also wrong.... 
X-Git-Tag: auth-4.0.0-rc1~2^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f40c17f3adff9719c2164393a7c7e03c9a882951;p=thirdparty%2Fpdns.git

not sure why valgrind needed this - it is redundant but in this case also wrong. It also broke v6 on OpenBSD.
---

diff --git a/pdns/misc.cc b/pdns/misc.cc
index c51fe961c2..c2b796921f 100644
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -845,7 +845,6 @@ void addCMsgSrcAddr(struct msghdr* msgh, void* cmsgbuf, const ComboAddress* sour
     memset(pkt, 0, sizeof(*pkt));
     pkt->ipi6_addr = source->sin6.sin6_addr;
     pkt->ipi6_ifindex = itfIndex;
-    msgh->msg_controllen = cmsg->cmsg_len; // makes valgrind happy and is slightly better style
   }
   else {
 #ifdef IP_PKTINFO
@@ -863,7 +862,6 @@ void addCMsgSrcAddr(struct msghdr* msgh, void* cmsgbuf, const ComboAddress* sour
     memset(pkt, 0, sizeof(*pkt));
     pkt->ipi_spec_dst = source->sin4.sin_addr;
     pkt->ipi_ifindex = itfIndex;
-    msgh->msg_controllen = cmsg->cmsg_len;
 #endif
 #ifdef IP_SENDSRCADDR
     struct in_addr *in;
@@ -878,7 +876,6 @@ void addCMsgSrcAddr(struct msghdr* msgh, void* cmsgbuf, const ComboAddress* sour
 
     in = (struct in_addr *) CMSG_DATA(cmsg);
     *in = source->sin4.sin_addr;
-    msgh->msg_controllen = cmsg->cmsg_len;
 #endif
   }
 }