From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 12 Aug 2019 12:24:24 +0000 (+0200)
Subject: Some stringerror() missed cases as spotted by chbruyand
X-Git-Tag: dnsdist-1.4.0-rc3~39^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296ddbfe7f009e07efbac338ab6e7c0cbb9022fb;p=thirdparty%2Fpdns.git

Some stringerror() missed cases as spotted by chbruyand
---

diff --git a/pdns/dnsdist-tcp.cc b/pdns/dnsdist-tcp.cc
index 259c377d3a..d4a7b635c1 100644
--- a/pdns/dnsdist-tcp.cc
+++ b/pdns/dnsdist-tcp.cc
@@ -288,7 +288,7 @@ void TCPClientCollection::addTCPClientThread()
       int err = errno;
       close(pipefds[0]);
       close(pipefds[1]);
-      errlog("Error setting the TCP thread communication pipe non-blocking: %s", strerror(err));
+      errlog("Error setting the TCP thread communication pipe non-blocking: %s", stringerror(err));
       return;
     }
 
@@ -296,7 +296,7 @@ void TCPClientCollection::addTCPClientThread()
       int err = errno;
       close(pipefds[0]);
       close(pipefds[1]);
-      errlog("Error setting the TCP thread communication pipe non-blocking: %s", strerror(err));
+      errlog("Error setting the TCP thread communication pipe non-blocking: %s", stringerror(err));
       return;
     }
   }
diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index c5753f8044..7f0785989b 100644
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -103,8 +103,9 @@ void UDPNameserver::bindIPv4()
     s=socket(AF_INET,SOCK_DGRAM,0);
 
     if(s<0) {
-      g_log<<Logger::Error<<"Unable to acquire UDP socket: "+stringerror() << endl;
-      throw PDNSException("Unable to acquire a UDP socket: "+stringerror());
+      int err = errno;
+      g_log<<Logger::Error<<"Unable to acquire UDP socket: "+stringerror(err) << endl;
+      throw PDNSException("Unable to acquire a UDP socket: "+stringerror(err));
     }
   
     setCloseOnExec(s);
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 7e41abe8e1..d446d487e3 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -516,7 +516,7 @@ static void setSocketBuffer(int fd, int optname, uint32_t size)
 
   if (setsockopt(fd, SOL_SOCKET, optname, (char*)&size, sizeof(size)) < 0) {
     int err = errno;
-    g_log << Logger::Error << "Unable to raise socket buffer size to " << size << ": " << strerror(err) << endl;
+    g_log << Logger::Error << "Unable to raise socket buffer size to " << size << ": " << stringerror(err) << endl;
   }
 }
 
@@ -738,7 +738,7 @@ static void writePid(void)
   else {
     int err = errno;
     g_log << Logger::Error << "Writing pid for " << Utility::getpid() << " to " << s_pidfname << " failed: "
-          << strerror(err) << endl;
+          << stringerror(err) << endl;
   }
 }
 
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index ced0b48061..67f9abd2d7 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -1301,7 +1301,7 @@ TCPNameserver::TCPNameserver()
         g_log<<Logger::Error<<"IPv6 Address " << *laddr << " does not exist on this server - skipping TCP bind" << endl;
         continue;
       } else {
-        g_log<<Logger::Error<<"Unable to bind to TCPv6 socket" << *laddr << ": "<<strerror(err)<<endl;
+        g_log<<Logger::Error<<"Unable to bind to TCPv6 socket" << *laddr << ": "<<stringerror(err)<<endl;
         throw PDNSException("Unable to bind to TCPv6 socket");
       }
     }