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 @@ | |||
12 | - djm@cvs.openbsd.org 2013/07/20 01:44:37 | 12 | - djm@cvs.openbsd.org 2013/07/20 01:44:37 |
13 | [ssh-keygen.c ssh.c] | 13 | [ssh-keygen.c ssh.c] |
14 | More useful error message on missing current user in /etc/passwd | 14 | More useful error message on missing current user in /etc/passwd |
15 | - djm@cvs.openbsd.org 2013/07/20 01:50:20 | ||
16 | [ssh-agent.c] | ||
17 | call cleanup_handler on SIGINT when in debug mode to ensure sockets | ||
18 | are cleaned up on manual exit; bz#2120 | ||
15 | 19 | ||
16 | 20130718 | 20 | 20130718 |
17 | - (djm) OpenBSD CVS Sync | 21 | - (djm) OpenBSD CVS Sync |
diff --git a/ssh-agent.c b/ssh-agent.c index 27df4f475..c3b11729c 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.176 2013/06/02 13:35:58 dtucker Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.177 2013/07/20 01:50:20 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1344,9 +1344,8 @@ skip: | |||
1344 | if (ac > 0) | 1344 | if (ac > 0) |
1345 | parent_alive_interval = 10; | 1345 | parent_alive_interval = 10; |
1346 | idtab_init(); | 1346 | idtab_init(); |
1347 | if (!d_flag) | ||
1348 | signal(SIGINT, SIG_IGN); | ||
1349 | signal(SIGPIPE, SIG_IGN); | 1347 | signal(SIGPIPE, SIG_IGN); |
1348 | signal(SIGINT, d_flag ? cleanup_handler : SIG_IGN); | ||
1350 | signal(SIGHUP, cleanup_handler); | 1349 | signal(SIGHUP, cleanup_handler); |
1351 | signal(SIGTERM, cleanup_handler); | 1350 | signal(SIGTERM, cleanup_handler); |
1352 | nalloc = 0; | 1351 | nalloc = 0; |