2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c67a10a9b..f799663fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
      [umac.h]
      oops, forgot to commit corresponding header change;
      spotted by jsg and jasper
+   - djm@cvs.openbsd.org 2013/07/25 00:29:10
+     [ssh.c]
+     daemonise backgrounded (ControlPersist'ed) multiplexing master to ensure
+     it is fully detached from its controlling terminal. based on debugging
 
 20130720
  - (djm) OpenBSD CVS Sync
diff --git a/ssh.c b/ssh.c
index 30e65338f..87233bc91 100644
--- a/ssh.c
+++ b/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
@@ -1022,6 +1022,7 @@ control_persist_detach(void)
                 if (devnull > STDERR_FILENO)
                         close(devnull);
         }
+        daemon(1, 1);
         setproctitle("%s [mux]", options.control_path);
 }