- markus@cvs.openbsd.org 2003/05/14 08:57:49

     [monitor.c]
     http://bugzilla.mindrot.org/show_bug.cgi?id=560
     Privsep child continues to run after monitor killed.
     Pass monitor signals through to child; Darren Tucker

2 files changed, 24 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6fc81a360..6b8fe8474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,11 @@
      - better formatting in SYNOPSIS
      - whitespace at EOL
      ok djm@
+   - markus@cvs.openbsd.org 2003/05/14 08:57:49
+     [monitor.c]
+     http://bugzilla.mindrot.org/show_bug.cgi?id=560
+     Privsep child continues to run after monitor killed.
+     Pass monitor signals through to child; Darren Tucker
  - (djm) Make portable build with MIT krb5 (some issues remain)
  - (djm) Add new UsePAM configuration directive to allow runtime control
    over usage of PAM. This allows non-root use of sshd when built with
@@ -1465,4 +1470,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2697 2003/05/14 09:30:38 djm Exp $
+$Id: ChangeLog,v 1.2698 2003/05/14 09:31:12 djm Exp $
diff --git a/monitor.c b/monitor.c
index 36f9a6c20..700925c8c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.39 2003/05/14 02:15:47 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.40 2003/05/14 08:57:49 markus Exp $");
 
 #include <openssl/dh.h>
 
@@ -143,6 +143,7 @@ static char *hostbased_chost = NULL;
 static char *auth_method = "unknown";
 static int session_id2_len = 0;
 static u_char *session_id2 = NULL;
+static pid_t monitor_child_pid;
 
 struct mon_table {
         enum monitor_reqtype type;
@@ -321,9 +322,25 @@ monitor_child_preauth(struct monitor *pmonitor)
         return (authctxt);
 }
 
+static void
+monitor_set_child_handler(pid_t pid)
+{
+        monitor_child_pid = pid;
+}
+
+static void
+monitor_child_handler(int signal)
+{
+        kill(monitor_child_pid, signal);
+}
+
 void
 monitor_child_postauth(struct monitor *pmonitor)
 {
+        monitor_set_child_handler(pmonitor->m_pid);
+        signal(SIGHUP, &monitor_child_handler);
+        signal(SIGTERM, &monitor_child_handler);
+
         if (compat20) {
                 mon_dispatch = mon_dispatch_postauth20;