From f265110ef0141c1ae10ea81946bbaec55201575f Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Thu, 25 Jul 2013 00:29:10 +0000
Subject: daemonise backgrounded (ControlPersist'ed) multiplexing master to
 ensure it is fully detached from its controlling terminal. based on debugging
 and patch from tedu@ ok dtucker@ "be careful" deraadt@

---
 usr.bin/ssh/ssh.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr.bin/ssh/ssh.c')

diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 4ca2240c87a..e9c86a1b272 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.380 2013/07/20 01:44:37 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.381 2013/07/25 00:29:10 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -971,6 +971,7 @@ control_persist_detach(void)
 		if (devnull > STDERR_FILENO)
 			close(devnull);
 	}
+	daemon(1, 1);
 	setproctitle("%s [mux]", options.control_path);
 }
 
-- 
cgit v1.2.3-59-g8ed1b