mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-25 23:05:21 +02:00
- 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
This commit is contained in:
parent
3009d3cbb8
commit
1f0e86f23f
@ -12,6 +12,10 @@
|
|||||||
- djm@cvs.openbsd.org 2013/07/20 01:44:37
|
- djm@cvs.openbsd.org 2013/07/20 01:44:37
|
||||||
[ssh-keygen.c ssh.c]
|
[ssh-keygen.c ssh.c]
|
||||||
More useful error message on missing current user in /etc/passwd
|
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
|
20130718
|
||||||
- (djm) OpenBSD CVS Sync
|
- (djm) OpenBSD CVS Sync
|
||||||
|
@ -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>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||||
@ -1344,9 +1344,8 @@ skip:
|
|||||||
if (ac > 0)
|
if (ac > 0)
|
||||||
parent_alive_interval = 10;
|
parent_alive_interval = 10;
|
||||||
idtab_init();
|
idtab_init();
|
||||||
if (!d_flag)
|
|
||||||
signal(SIGINT, SIG_IGN);
|
|
||||||
signal(SIGPIPE, SIG_IGN);
|
signal(SIGPIPE, SIG_IGN);
|
||||||
|
signal(SIGINT, d_flag ? cleanup_handler : SIG_IGN);
|
||||||
signal(SIGHUP, cleanup_handler);
|
signal(SIGHUP, cleanup_handler);
|
||||||
signal(SIGTERM, cleanup_handler);
|
signal(SIGTERM, cleanup_handler);
|
||||||
nalloc = 0;
|
nalloc = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user