tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2002/11/07 22:35:38 

[scp.c]
     check exit status from ssh, and exit(1) if ssh fails; bug#369;
     binder@arago.de
This commit is contained in:
Ben Lindstrom 2002-11-09 15:54:08 +00:00
parent b6df73b06a
commit 007eb912ea
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -32,6 +32,10 @@
target host and ssh-keysign(8) does not know the remote hostname target host and ssh-keysign(8) does not know the remote hostname
and not trust ssh(1) about the hostname, so we add a new option and not trust ssh(1) about the hostname, so we add a new option
EnableSSHKeysign; ok djm@, report from zierke@informatik.uni-hamburg.de EnableSSHKeysign; ok djm@, report from zierke@informatik.uni-hamburg.de
- markus@cvs.openbsd.org 2002/11/07 22:35:38
[scp.c]
check exit status from ssh, and exit(1) if ssh fails; bug#369;
binder@arago.de
20021021 20021021
- (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from
@ -809,4 +813,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2508 2002/11/09 15:52:31 mouring Exp $ $Id: ChangeLog,v 1.2509 2002/11/09 15:54:08 mouring Exp $

29
scp.c
View File

@ -75,7 +75,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: scp.c,v 1.91 2002/06/19 00:27:55 deraadt Exp $"); RCSID("$OpenBSD: scp.c,v 1.92 2002/11/07 22:35:38 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "atomicio.h" #include "atomicio.h"
@ -125,6 +125,9 @@ int showprogress = 1;
/* This is the program to execute for the secured connection. ("ssh" or -S) */ /* This is the program to execute for the secured connection. ("ssh" or -S) */
char *ssh_program = _PATH_SSH_PROGRAM; char *ssh_program = _PATH_SSH_PROGRAM;
/* This is used to store the pid of ssh_program */
pid_t do_cmd_pid;
/* /*
* This function executes the given command as the specified user on the * This function executes the given command as the specified user on the
* given host. This returns < 0 if execution fails, and >= 0 otherwise. This * given host. This returns < 0 if execution fails, and >= 0 otherwise. This
@ -159,7 +162,8 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
close(reserved[1]); close(reserved[1]);
/* For a child to execute the command on the remote host using ssh. */ /* For a child to execute the command on the remote host using ssh. */
if (fork() == 0) { do_cmd_pid = fork();
if (do_cmd_pid == 0) {
/* Child. */ /* Child. */
close(pin[1]); close(pin[1]);
close(pout[0]); close(pout[0]);
@ -177,6 +181,8 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
execvp(ssh_program, args.list); execvp(ssh_program, args.list);
perror(ssh_program); perror(ssh_program);
exit(1); exit(1);
} else if (do_cmd_pid == -1) {
fatal("fork: %s", strerror(errno));
} }
/* Parent. Close the other side, and return the local side. */ /* Parent. Close the other side, and return the local side. */
close(pin[0]); close(pin[0]);
@ -219,7 +225,7 @@ main(argc, argv)
int argc; int argc;
char *argv[]; char *argv[];
{ {
int ch, fflag, tflag; int ch, fflag, tflag, status;
char *targ; char *targ;
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
@ -317,6 +323,7 @@ main(argc, argv)
targetshouldbedirectory = 1; targetshouldbedirectory = 1;
remin = remout = -1; remin = remout = -1;
do_cmd_pid = -1;
/* Command to be executed on remote system using "ssh". */ /* Command to be executed on remote system using "ssh". */
(void) snprintf(cmd, sizeof cmd, "scp%s%s%s%s", (void) snprintf(cmd, sizeof cmd, "scp%s%s%s%s",
verbose_mode ? " -v" : "", verbose_mode ? " -v" : "",
@ -332,6 +339,22 @@ main(argc, argv)
if (targetshouldbedirectory) if (targetshouldbedirectory)
verifydir(argv[argc - 1]); verifydir(argv[argc - 1]);
} }
/*
* Finally check the exit status of the ssh process, if one was forked
* and no error has occured yet
*/
if (do_cmd_pid != -1 && errs == 0) {
if (remin != -1)
(void) close(remin);
if (remout != -1)
(void) close(remout);
if (waitpid(do_cmd_pid, &status, 0) == -1)
errs = 1;
else {
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
errs = 1;
}
}
exit(errs != 0); exit(errs != 0);
} }