diff options
| author | Damien Miller <djm@mindrot.org> | 2013-07-20 13:22:49 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-07-20 13:22:49 +1000 |
| commit | 1f0e86f23fcebb026371c0888402a981df2a61c4 (patch) | |
| tree | ee6493082ff4e615bc630e7b6e2fb0998b923b53 | |
| parent | 3009d3cbb89316b1294fb5cedb54770b5d114d04 (diff) | |
- djm@cvs.openbsd.org 2013/07/20 01:50:20
[ssh-agent.c]
call cleanup_handler on SIGINT when in debug mode to ensure sockets
are cleaned up on manual exit; bz#2120
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ssh-agent.c | 5 |
2 files changed, 6 insertions, 3 deletions
@@ -12,6 +12,10 @@ - djm@cvs.openbsd.org 2013/07/20 01:44:37 [ssh-keygen.c ssh.c] More useful error message on missing current user in /etc/passwd + - djm@cvs.openbsd.org 2013/07/20 01:50:20 + [ssh-agent.c] + call cleanup_handler on SIGINT when in debug mode to ensure sockets + are cleaned up on manual exit; bz#2120 20130718 - (djm) OpenBSD CVS Sync diff --git a/ssh-agent.c b/ssh-agent.c index 27df4f47..c3b11729 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.176 2013/06/02 13:35:58 dtucker Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.177 2013/07/20 01:50:20 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1344,9 +1344,8 @@ skip: if (ac > 0) parent_alive_interval = 10; idtab_init(); - if (!d_flag) - signal(SIGINT, SIG_IGN); signal(SIGPIPE, SIG_IGN); + signal(SIGINT, d_flag ? cleanup_handler : SIG_IGN); signal(SIGHUP, cleanup_handler); signal(SIGTERM, cleanup_handler); nalloc = 0; |