RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2003/06/04 12:41:22 

[sftp.c]
     kill ssh process on receipt of signal; ok markus@
This commit is contained in:
Damien Miller 2003-06-04 22:51:38 +10:00
parent b69aaa8db7
commit cc685c1cbe
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -24,6 +24,9 @@
[scp.c] [scp.c]
kill ssh process upon receipt of signal, bz #241. kill ssh process upon receipt of signal, bz #241.
based on patch from esb AT hawaii.edu; ok markus@ based on patch from esb AT hawaii.edu; ok markus@
- djm@cvs.openbsd.org 2003/06/04 12:41:22
[sftp.c]
kill ssh process on receipt of signal; ok markus@
- (djm) Update to fix of bug #584: lock card before return. - (djm) Update to fix of bug #584: lock card before return.
From larsch@trustcenter.de From larsch@trustcenter.de
@ -454,4 +457,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2779 2003/06/04 12:51:24 djm Exp $ $Id: ChangeLog,v 1.2780 2003/06/04 12:51:38 djm Exp $

28
sftp.c
View File

@ -24,7 +24,7 @@
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sftp.c,v 1.35 2003/05/15 03:44:00 mouring Exp $"); RCSID("$OpenBSD: sftp.c,v 1.36 2003/06/04 12:41:22 djm Exp $");
#include "buffer.h" #include "buffer.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -46,11 +46,21 @@ char *__progname;
FILE* infile; FILE* infile;
size_t copy_buffer_len = 32768; size_t copy_buffer_len = 32768;
size_t num_requests = 16; size_t num_requests = 16;
static pid_t sshpid = -1;
extern int showprogress; extern int showprogress;
static void static void
connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid) killchild(int signo)
{
if (sshpid > 1)
kill(sshpid, signo);
_exit(1);
}
static void
connect_to_server(char *path, char **args, int *in, int *out)
{ {
int c_in, c_out; int c_in, c_out;
@ -72,9 +82,9 @@ connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid)
c_in = c_out = inout[1]; c_in = c_out = inout[1];
#endif /* USE_PIPES */ #endif /* USE_PIPES */
if ((*sshpid = fork()) == -1) if ((sshpid = fork()) == -1)
fatal("fork: %s", strerror(errno)); fatal("fork: %s", strerror(errno));
else if (*sshpid == 0) { else if (sshpid == 0) {
if ((dup2(c_in, STDIN_FILENO) == -1) || if ((dup2(c_in, STDIN_FILENO) == -1) ||
(dup2(c_out, STDOUT_FILENO) == -1)) { (dup2(c_out, STDOUT_FILENO) == -1)) {
fprintf(stderr, "dup2: %s\n", strerror(errno)); fprintf(stderr, "dup2: %s\n", strerror(errno));
@ -89,6 +99,9 @@ connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid)
exit(1); exit(1);
} }
signal(SIGTERM, killchild);
signal(SIGINT, killchild);
signal(SIGHUP, killchild);
close(c_in); close(c_in);
close(c_out); close(c_out);
} }
@ -109,7 +122,6 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int in, out, ch, err; int in, out, ch, err;
pid_t sshpid;
char *host, *userhost, *cp, *file2; char *host, *userhost, *cp, *file2;
int debug_level = 0, sshver = 2; int debug_level = 0, sshver = 2;
char *file1 = NULL, *sftp_server = NULL; char *file1 = NULL, *sftp_server = NULL;
@ -227,15 +239,13 @@ main(int argc, char **argv)
args.list[0] = ssh_program; args.list[0] = ssh_program;
fprintf(stderr, "Connecting to %s...\n", host); fprintf(stderr, "Connecting to %s...\n", host);
connect_to_server(ssh_program, args.list, &in, &out, connect_to_server(ssh_program, args.list, &in, &out);
&sshpid);
} else { } else {
args.list = NULL; args.list = NULL;
addargs(&args, "sftp-server"); addargs(&args, "sftp-server");
fprintf(stderr, "Attaching to %s...\n", sftp_direct); fprintf(stderr, "Attaching to %s...\n", sftp_direct);
connect_to_server(sftp_direct, args.list, &in, &out, connect_to_server(sftp_direct, args.list, &in, &out);
&sshpid);
} }
err = interactive_loop(in, out, file1, file2); err = interactive_loop(in, out, file1, file2);