diff options
author | Damien Miller <djm@mindrot.org> | 2010-10-07 22:07:32 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-10-07 22:07:32 +1100 |
commit | a41ccca643364b3b1b65d7a818577dd35360fa20 (patch) | |
tree | cfcd6f4c1696af7bc514e6835d08d6ccbcfb8974 /clientloop.c | |
parent | 38d9a965bfc795fba1c000e0b42e705e2bcd34c9 (diff) |
- djm@cvs.openbsd.org 2010/10/06 06:39:28
[clientloop.c ssh.c sshconnect.c sshconnect.h]
kill proxy command on fatal() (we already kill it on clean exit);
ok markus@
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clientloop.c b/clientloop.c index de7979366..848aacd4a 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.222 2010/07/19 09:15:12 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.223 2010/10/06 06:39:28 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 |
@@ -2129,5 +2129,6 @@ cleanup_exit(int i) | |||
2129 | leave_non_blocking(); | 2129 | leave_non_blocking(); |
2130 | if (options.control_path != NULL && muxserver_sock != -1) | 2130 | if (options.control_path != NULL && muxserver_sock != -1) |
2131 | unlink(options.control_path); | 2131 | unlink(options.control_path); |
2132 | ssh_kill_proxy_command(); | ||
2132 | _exit(i); | 2133 | _exit(i); |
2133 | } | 2134 | } |