From: Otto <otto.moerbeek@open-xchange.com>
Date: Fri, 29 Oct 2021 13:41:34 +0000 (+0200)
Subject: Use FDWrapper
X-Git-Tag: rec-4.6.0-beta1~17^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac3f1f35a03704284b3f71b0aa3d28448aefeb7a;p=thirdparty%2Fpdns.git

Use FDWrapper
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 9f0e8e4d04..79e30ee9c0 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4206,9 +4206,8 @@ template ThreadTimes broadcastAccFunction(const boost::function<ThreadTimes*()>&
 
 static void handleRCC(int fd, FDMultiplexer::funcparam_t& var)
 {
-  int clientfd;
   try {
-    clientfd = accept(fd, nullptr, nullptr);
+    FDWrapper clientfd = accept(fd, nullptr, nullptr);
     if (clientfd == -1) {
       throw PDNSException("accept failed");
     }
@@ -4228,9 +4227,6 @@ static void handleRCC(int fd, FDMultiplexer::funcparam_t& var)
   catch(const PDNSException& ae) {
     g_log<<Logger::Error<<"Error dealing with control socket request: "<<ae.reason<<endl;
   }
-  if (clientfd != -1) {
-    close(clientfd);
-  }
 }
 
 static void TCPIOHandlerStateChange(IOState oldstate, IOState newstate, std::shared_ptr<PacketID>& pid)