- djm@cvs.openbsd.org 2010/10/06 21:10:21

     [sshconnect.c]
     swapped args to kill(2)

diff --git a/ChangeLog b/ChangeLog
index 69711b9b23106cfb8d1675ebad8423ea1feacdb3..f1f6738f3c167db7bb8275d27b585d3e9e341ac0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@
      [clientloop.c ssh.c sshconnect.c sshconnect.h]
      kill proxy command on fatal() (we already kill it on clean exit);
      ok markus@
+   - djm@cvs.openbsd.org 2010/10/06 21:10:21
+     [sshconnect.c]
+     swapped args to kill(2)
 
 20100924
  - (djm) OpenBSD CVS Sync

diff --git a/sshconnect.c b/sshconnect.c
index c849ca3935f12d5ec3bbaf5492783e94aed4d161..2cbd47d0c66cedc05bd11a055c87f83a056cf93c 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.227 2010/10/06 06:39:28 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.228 2010/10/06 21:10:21 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -176,7 +176,7 @@ ssh_kill_proxy_command(void)
         * case it hangs and instead rely on init to reap the child
         */
        if (proxy_command_pid > 1)
-               kill(SIGHUP, proxy_command_pid);
+               kill(proxy_command_pid, SIGHUP);
 }
 
 /*