From 8654d16f0ff3bfe17aa4616f03aba84acc5458e5 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 22 Sep 2003 21:14:55 +1000 Subject: [PATCH] - markus@cvs.openbsd.org 2003/09/19 17:40:20 [scp.c] error handling for remote-remote copy; #638; report Harald Koenig; ok millert, fgs, henning, deraadt --- ChangeLog | 6 +++++- scp.c | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 340be6e2c..472cd7c41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,10 @@ - markus@cvs.openbsd.org 2003/09/19 11:33:09 [packet.c sshd.c] do not call packet_close on fatal; ok deraadt + - markus@cvs.openbsd.org 2003/09/19 17:40:20 + [scp.c] + error handling for remote-remote copy; #638; report Harald Koenig; + ok millert, fgs, henning, deraadt 20030919 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; @@ -1200,4 +1204,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3034 2003/09/22 11:13:59 dtucker Exp $ +$Id: ChangeLog,v 1.3035 2003/09/22 11:14:55 dtucker Exp $ diff --git a/scp.c b/scp.c index 4f9247c2d..a1f136a1f 100644 --- a/scp.c +++ b/scp.c @@ -71,7 +71,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.108 2003/07/18 01:54:25 deraadt Exp $"); +RCSID("$OpenBSD: scp.c,v 1.109 2003/09/19 17:40:20 markus Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -426,7 +426,8 @@ toremote(char *targ, int argc, char **argv) } if (verbose_mode) fprintf(stderr, "Executing: %s\n", bp); - (void) system(bp); + if (system(bp) != 0) + errs = 1; (void) xfree(bp); } else { /* local to remote */ if (remin == -1) {