From ad790022fddd5627eb237b95acae210c9b00c3de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Dec 2014 13:41:00 +0100
Subject: Doh

---
 src/libutil/util.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libutil/util.cc')

diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 5895e7200e96..a91cf26aaa66 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -850,7 +850,7 @@ void killUser(uid_t uid)
         }
 
         _exit(0);
-    });
+    }, options);
 
     int status = pid.wait(true);
     if (status != 0)
@@ -885,7 +885,7 @@ static pid_t doFork(bool allowVfork, std::function<void()> fun)
 pid_t startProcess(std::function<void()> fun, const ProcessOptions & options)
 {
     auto wrapper = [&]() {
-        _writeToStderr = 0;
+        if (!options.allowVfork) _writeToStderr = 0;
         try {
 #if __linux__
             if (options.dieWithParent && prctl(PR_SET_PDEATHSIG, SIGKILL) == -1)
-- 
cgit 1.4.1