From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 4 Jun 2019 12:35:16 +0000 (+0200)
Subject: Fix error handling in poll loop.
X-Git-Tag: auth-4.2.0-rc3~19^2~20^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d70002557ddee859ca917bb44253ab36ce3f02d3;p=pdns

Fix error handling in poll loop.

(cherry picked from commit 3252abefc2b75c19655c0be9570b1d293e948fd8)
---

diff --git a/pdns/calidns.cc b/pdns/calidns.cc
index 06862882a..0f11e790f 100644
--- a/pdns/calidns.cc
+++ b/pdns/calidns.cc
@@ -93,18 +93,16 @@ static void* recvThread(const vector<Socket*>* sockets)
 #if HAVE_RECVMMSG
         if ((err=recvmmsg(pfd.fd, &buf[0], buf.size(), MSG_WAITFORONE, 0)) < 0 ) {
           if(errno != EAGAIN)
-            cerr<<"recvmmsg gave error, ignoring: "<<strerror(errno)<<endl;
-          unixDie("recvmmsg");
+            unixDie("recvmmsg");
           continue;
         }
         g_recvcounter+=err;
         for(int n=0; n < err; ++n)
-        g_recvbytes += buf[n].msg_len;
+          g_recvbytes += buf[n].msg_len;
 #else
         if ((err = recvmsg(pfd.fd, &buf, 0)) < 0) {
           if (errno != EAGAIN)
-            cerr << "recvmsg gave error, ignoring: " << strerror(errno) << endl;
-          unixDie("recvmsg");
+            unixDie("recvmsg");
           continue;
         }
         g_recvcounter++;