summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-22 21:14:55 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-22 21:14:55 +1000
commit8654d16f0ff3bfe17aa4616f03aba84acc5458e5 (patch)
treea12ce7568482c02de903353599d3eb5bde28b703
parentaaa56cb80473feda33ef44643cc2a95df9d67984 (diff)
- 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
-rw-r--r--ChangeLog6
-rw-r--r--scp.c5
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 @@
64 - markus@cvs.openbsd.org 2003/09/19 11:33:09 64 - markus@cvs.openbsd.org 2003/09/19 11:33:09
65 [packet.c sshd.c] 65 [packet.c sshd.c]
66 do not call packet_close on fatal; ok deraadt 66 do not call packet_close on fatal; ok deraadt
67 - markus@cvs.openbsd.org 2003/09/19 17:40:20
68 [scp.c]
69 error handling for remote-remote copy; #638; report Harald Koenig;
70 ok millert, fgs, henning, deraadt
67 71
6820030919 7220030919
69 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; 73 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@@ -1200,4 +1204,4 @@
1200 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1204 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1201 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1205 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1202 1206
1203$Id: ChangeLog,v 1.3034 2003/09/22 11:13:59 dtucker Exp $ 1207$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 @@
71 */ 71 */
72 72
73#include "includes.h" 73#include "includes.h"
74RCSID("$OpenBSD: scp.c,v 1.108 2003/07/18 01:54:25 deraadt Exp $"); 74RCSID("$OpenBSD: scp.c,v 1.109 2003/09/19 17:40:20 markus Exp $");
75 75
76#include "xmalloc.h" 76#include "xmalloc.h"
77#include "atomicio.h" 77#include "atomicio.h"
@@ -426,7 +426,8 @@ toremote(char *targ, int argc, char **argv)
426 } 426 }
427 if (verbose_mode) 427 if (verbose_mode)
428 fprintf(stderr, "Executing: %s\n", bp); 428 fprintf(stderr, "Executing: %s\n", bp);
429 (void) system(bp); 429 if (system(bp) != 0)
430 errs = 1;
430 (void) xfree(bp); 431 (void) xfree(bp);
431 } else { /* local to remote */ 432 } else { /* local to remote */
432 if (remin == -1) { 433 if (remin == -1) {