continuing fallout of utility disentanglement

diff --git a/modules/pipebackend/coprocess.cc b/modules/pipebackend/coprocess.cc
index 247631c42564e638dd6affe8d3b0e597a23234b7..12ed88008ad89f36cbe3e5df1129a2744a4b7744 100644 (file)
--- a/modules/pipebackend/coprocess.cc
+++ b/modules/pipebackend/coprocess.cc
@@ -48,9 +48,9 @@ void CoProcess::launch(const char **argv, int timeout, int infd, int outfd)
     throw PDNSException("Unable to fork for coprocess: "+stringerror());
   else if(d_pid>0) { // parent speaking
     close(d_fd1[0]);
-    Utility::setCloseOnExec(d_fd1[1]);
+    setCloseOnExec(d_fd1[1]);
     close(d_fd2[1]);
-    Utility::setCloseOnExec(d_fd2[0]);
+    setCloseOnExec(d_fd2[0]);
     if(!(d_fp=fdopen(d_fd2[0],"r")))
       throw PDNSException("Unable to associate a file pointer with pipe: "+stringerror());
     if( d_timeout)

diff --git a/pdns/utility.hh b/pdns/utility.hh
index 449886d7a9c41c2fce70b924e40440c3c08a086d..b32bce36a9ff3efd083df63f75f8aa423b5c7450 100644 (file)
--- a/pdns/utility.hh
+++ b/pdns/utility.hh
@@ -141,10 +141,6 @@ public:
   //! Drops the program's user privileges.
   static void dropUserPrivs( int uid );
   
-  
-  //! Marks the socket to be closed on exec().
-  static bool setCloseOnExec ( Utility::sock_t socket );
-
   //! Sets the socket into Bind-any mode
   static void setBindAny ( int af, Utility::sock_t socket );