From ec19a40b94f8d229a283720ad72324d9eed32f86 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 5 Mar 2001 06:12:01 +0000 Subject: - deraadt@cvs.openbsd.org 2001/02/28 05:36:28 [sftp.c] do not kill the subprocess on termination (we will see if this helps things or hurts things) --- ChangeLog | 6 +++++- sftp.c | 7 +------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9f3a8d46..68c4a5978 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,10 @@ - deraadt@cvs.openbsd.org 2001/02/28 05:34:28 [misc.c] pull in protos + - deraadt@cvs.openbsd.org 2001/02/28 05:36:28 + [sftp.c] + do not kill the subprocess on termination (we will see if this helps + things or hurts things) 20010304 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. @@ -4253,4 +4257,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.869 2001/03/05 06:09:31 mouring Exp $ +$Id: ChangeLog,v 1.870 2001/03/05 06:12:01 mouring Exp $ diff --git a/sftp.c b/sftp.c index 0fba6749f..16a2616a9 100644 --- a/sftp.c +++ b/sftp.c @@ -24,7 +24,7 @@ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.7 2001/02/08 00:04:52 markus Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.8 2001/02/28 05:36:28 deraadt Exp $"); /* XXX: commandline mode */ /* XXX: copy between two remote hosts (commandline) */ @@ -254,11 +254,6 @@ main(int argc, char **argv) close(in); close(out); -#if !defined(HAVE_CYGWIN) - if (kill(sshpid, SIGHUP) == -1) - fatal("Couldn't terminate ssh process: %s", strerror(errno)); -#endif - if (waitpid(sshpid, NULL, 0) == -1) fatal("Couldn't wait for ssh process: %s", strerror(errno)); -- cgit v1.2.3