From 154aa7f71ade55fe5ce43503ade85fc2a107a331 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 15 Apr 2012 00:42:16 +0200
Subject: [PATCH] Set a few more close-on-exec flags

---
 src/nix-worker/nix-worker.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc
index a95252350..4b0c9e319 100644
--- a/src/nix-worker/nix-worker.cc
+++ b/src/nix-worker/nix-worker.cc
@@ -697,6 +697,8 @@ static void daemonLoop()
     if (fdSocket == -1)
         throw SysError("cannot create Unix domain socket");
 
+    closeOnExec(fdSocket);
+    
     string socketPath = nixStateDir + DEFAULT_SOCKET_PATH;
 
     createDirs(dirOf(socketPath));
@@ -751,6 +753,8 @@ static void daemonLoop()
 		    throw SysError("accepting connection");
             }
 
+            closeOnExec(remote);
+            
             /* Get the identity of the caller, if possible. */
             uid_t clientUid = -1;
             pid_t clientPid = -1;