summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--monitor.c3
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 @@
28 on a socket, such as is the case when ProxyCommand is used. 28 on a socket, such as is the case when ProxyCommand is used.
29 Gives hostbased auth an opportunity to work; bz#616, report 29 Gives hostbased auth an opportunity to work; bz#616, report
30 and feedback stuart AT kaloram.com; ok markus@ 30 and feedback stuart AT kaloram.com; ok markus@
31 - djm@cvs.openbsd.org 2007/05/17 20:52:13
32 [monitor.c]
33 pass received SIGINT from monitor to postauth child so it can clean
34 up properly. bz#1196, patch from senthilkumar_sen AT hotpop.com;
35 ok markus@
31 36
3220070509 3720070509
33 - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h. 38 - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h.
@@ -2928,4 +2933,4 @@
2928 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2933 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2929 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2934 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2930 2935
2931$Id: ChangeLog,v 1.4666 2007/05/20 05:09:42 dtucker Exp $ 2936$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 @@
1/* $OpenBSD: monitor.c,v 1.90 2007/02/19 10:45:58 dtucker Exp $ */ 1/* $OpenBSD: monitor.c,v 1.91 2007/05/17 20:52:13 djm Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -409,6 +409,7 @@ monitor_child_postauth(struct monitor *pmonitor)
409 monitor_set_child_handler(pmonitor->m_pid); 409 monitor_set_child_handler(pmonitor->m_pid);
410 signal(SIGHUP, &monitor_child_handler); 410 signal(SIGHUP, &monitor_child_handler);
411 signal(SIGTERM, &monitor_child_handler); 411 signal(SIGTERM, &monitor_child_handler);
412 signal(SIGINT, &monitor_child_handler);
412 413
413 if (compat20) { 414 if (compat20) {
414 mon_dispatch = mon_dispatch_postauth20; 415 mon_dispatch = mon_dispatch_postauth20;