2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ee16d85a2..0c163d497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,11 @@
      on a socket, such as is the case when ProxyCommand is used.
      Gives hostbased auth an opportunity to work; bz#616, report
      and feedback stuart AT kaloram.com; ok markus@
+   - djm@cvs.openbsd.org 2007/05/17 20:52:13
+     [monitor.c]
+     pass received SIGINT from monitor to postauth child so it can clean
+     up properly. bz#1196, patch from senthilkumar_sen AT hotpop.com;
+     ok markus@
 
 20070509
  - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h.
@@ -2928,4 +2933,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4666 2007/05/20 05:09:42 dtucker Exp $
+$Id: ChangeLog,v 1.4667 2007/05/20 05:10:16 dtucker Exp $
diff --git a/monitor.c b/monitor.c
index 02f2dc869..08c7ea3cb 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.90 2007/02/19 10:45:58 dtucker Exp $ */
+/* $OpenBSD: monitor.c,v 1.91 2007/05/17 20:52:13 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -409,6 +409,7 @@ monitor_child_postauth(struct monitor *pmonitor)
         monitor_set_child_handler(pmonitor->m_pid);
         signal(SIGHUP, &monitor_child_handler);
         signal(SIGTERM, &monitor_child_handler);
+        signal(SIGINT, &monitor_child_handler);
 
         if (compat20) {
                 mon_dispatch = mon_dispatch_postauth20;