From: Ivo Timmermans <ivo@lychnis.net>
Date: Wed, 22 Nov 2000 17:48:15 +0000 (+0000)
Subject: Add more checks to ensure that filedescriptors are right in
X-Git-Tag: release-1.0pre4~149
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=e42255ae1374fe65e92de72de4508a84bdb91fa1;p=tinc

Add more checks to ensure that filedescriptors are right in
_execute_script().
---

diff --git a/src/process.c b/src/process.c
index eb066abc..c4a76ab5 100644
--- a/src/process.c
+++ b/src/process.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: process.c,v 1.1.2.7 2000/11/20 23:29:47 guus Exp $
+    $Id: process.c,v 1.1.2.8 2000/11/22 17:48:15 zarq Exp $
 */
 
 #include "config.h"
@@ -207,14 +207,20 @@ cp
   fcloseall();
 
   /* Open standard input */
-  if(open("/dev/null", O_RDONLY) < 0)
+  if((fd = open("/dev/null", O_RDONLY)) < 0)
     {
       syslog(LOG_ERR, _("Opening `/dev/null' failed: %m"));
       error = 1;
     }
+  if(dup2(fd, 0) != 0)
+    {
+      syslog(LOG_ERR, _("Couldn't assign /dev/null to standard input: %m"));
+      error = 1;
+    }
 
   if(!error)
     {
+      close(1);  /* fd #1 should be the first available filedescriptor now. */
       /* Standard output directly goes to syslog */
       openlog(name, LOG_CONS | LOG_PID, LOG_DAEMON);
       /* Standard error as well */