summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-10-07 22:07:58 +1100
committerDamien Miller <djm@mindrot.org>2010-10-07 22:07:58 +1100
commit45fcdaa1cf21557a076660d701e6e7a068907374 (patch)
tree5ea77bc782ada4f19d578e6aa5b94d3218274d1e
parenta41ccca643364b3b1b65d7a818577dd35360fa20 (diff)
- djm@cvs.openbsd.org 2010/10/06 21:10:21
[sshconnect.c] swapped args to kill(2)
-rw-r--r--ChangeLog3
-rw-r--r--sshconnect.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 69711b9b2..f1f6738f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@
34 [clientloop.c ssh.c sshconnect.c sshconnect.h] 34 [clientloop.c ssh.c sshconnect.c sshconnect.h]
35 kill proxy command on fatal() (we already kill it on clean exit); 35 kill proxy command on fatal() (we already kill it on clean exit);
36 ok markus@ 36 ok markus@
37 - djm@cvs.openbsd.org 2010/10/06 21:10:21
38 [sshconnect.c]
39 swapped args to kill(2)
37 40
3820100924 4120100924
39 - (djm) OpenBSD CVS Sync 42 - (djm) OpenBSD CVS Sync
diff --git a/sshconnect.c b/sshconnect.c
index c849ca393..2cbd47d0c 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.227 2010/10/06 06:39:28 djm Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.228 2010/10/06 21:10:21 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
@@ -176,7 +176,7 @@ ssh_kill_proxy_command(void)
176 * case it hangs and instead rely on init to reap the child 176 * case it hangs and instead rely on init to reap the child
177 */ 177 */
178 if (proxy_command_pid > 1) 178 if (proxy_command_pid > 1)
179 kill(SIGHUP, proxy_command_pid); 179 kill(proxy_command_pid, SIGHUP);
180} 180}
181 181
182/* 182/*