diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sftp.c | 7 |
2 files changed, 6 insertions, 7 deletions
@@ -61,6 +61,10 @@ | |||
61 | - deraadt@cvs.openbsd.org 2001/02/28 05:34:28 | 61 | - deraadt@cvs.openbsd.org 2001/02/28 05:34:28 |
62 | [misc.c] | 62 | [misc.c] |
63 | pull in protos | 63 | pull in protos |
64 | - deraadt@cvs.openbsd.org 2001/02/28 05:36:28 | ||
65 | [sftp.c] | ||
66 | do not kill the subprocess on termination (we will see if this helps | ||
67 | things or hurts things) | ||
64 | 68 | ||
65 | 20010304 | 69 | 20010304 |
66 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. | 70 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. |
@@ -4253,4 +4257,4 @@ | |||
4253 | - Wrote replacements for strlcpy and mkdtemp | 4257 | - Wrote replacements for strlcpy and mkdtemp |
4254 | - Released 1.0pre1 | 4258 | - Released 1.0pre1 |
4255 | 4259 | ||
4256 | $Id: ChangeLog,v 1.869 2001/03/05 06:09:31 mouring Exp $ | 4260 | $Id: ChangeLog,v 1.870 2001/03/05 06:12:01 mouring Exp $ |
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | 26 | ||
27 | RCSID("$OpenBSD: sftp.c,v 1.7 2001/02/08 00:04:52 markus Exp $"); | 27 | RCSID("$OpenBSD: sftp.c,v 1.8 2001/02/28 05:36:28 deraadt Exp $"); |
28 | 28 | ||
29 | /* XXX: commandline mode */ | 29 | /* XXX: commandline mode */ |
30 | /* XXX: copy between two remote hosts (commandline) */ | 30 | /* XXX: copy between two remote hosts (commandline) */ |
@@ -254,11 +254,6 @@ main(int argc, char **argv) | |||
254 | close(in); | 254 | close(in); |
255 | close(out); | 255 | close(out); |
256 | 256 | ||
257 | #if !defined(HAVE_CYGWIN) | ||
258 | if (kill(sshpid, SIGHUP) == -1) | ||
259 | fatal("Couldn't terminate ssh process: %s", strerror(errno)); | ||
260 | #endif | ||
261 | |||
262 | if (waitpid(sshpid, NULL, 0) == -1) | 257 | if (waitpid(sshpid, NULL, 0) == -1) |
263 | fatal("Couldn't wait for ssh process: %s", strerror(errno)); | 258 | fatal("Couldn't wait for ssh process: %s", strerror(errno)); |
264 | 259 | ||