summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-agent.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b1f0fa654..6ca0156c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -162,6 +162,9 @@
162 - deraadt@cvs.openbsd.org 2006/03/25 18:40:14 162 - deraadt@cvs.openbsd.org 2006/03/25 18:40:14
163 [ssh-keygen.c] 163 [ssh-keygen.c]
164 cast strtonum() result to right type 164 cast strtonum() result to right type
165 - deraadt@cvs.openbsd.org 2006/03/25 18:41:45
166 [ssh-agent.c]
167 mark two more signal handlers ARGSUSED
165 168
16620060325 16920060325
167 - OpenBSD CVS Sync 170 - OpenBSD CVS Sync
@@ -4419,4 +4422,4 @@
4419 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4422 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4420 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4423 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4421 4424
4422$Id: ChangeLog,v 1.4281 2006/03/26 03:27:57 djm Exp $ 4425$Id: ChangeLog,v 1.4282 2006/03/26 03:28:14 djm Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index c169d226f..eb99effd0 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.134 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.135 2006/03/25 18:41:45 deraadt 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
@@ -962,6 +962,7 @@ cleanup_exit(int i)
962 _exit(i); 962 _exit(i);
963} 963}
964 964
965/*ARGSUSED*/
965static void 966static void
966cleanup_handler(int sig) 967cleanup_handler(int sig)
967{ 968{
@@ -969,6 +970,7 @@ cleanup_handler(int sig)
969 _exit(2); 970 _exit(2);
970} 971}
971 972
973/*ARGSUSED*/
972static void 974static void
973check_parent_exists(int sig) 975check_parent_exists(int sig)
974{ 976{