From 2b89de6562469c7bee6ae8e78205012ef43396dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 May 2014 14:26:28 -0400
Subject: setsid when running webapp in foreground too

This avoids ssh prompting for passwords on stdin, ever.

It may also change other behavior of other programs, as there is no
controlling terminal now. However, setsid was already done when running the
assistant in daemon mode, so any behavior changes should not be really new.
---
 Assistant.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Assistant.hs')

diff --git a/Assistant.hs b/Assistant.hs
index b5caceac2..5dd6a7ece 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -84,9 +84,7 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser =
 				fdToHandle =<< dup stdError
 			let undaemonize a = do
 				debugM desc $ "logging to " ++ logfile
-				Utility.Daemon.lockPidFile pidfile
-				Utility.LogFile.redirLog logfd
-				a
+				Utility.Daemon.foreground logfd (Just pidfile) a
 			start undaemonize $ 
 				case startbrowser of
 					Nothing -> Nothing
-- 
cgit v1.2.3