- 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

1 files changed, 2 insertions, 3 deletions

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 @@
-/* $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;