summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--scp.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d26a83f5..f5d3b36f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 - djm@cvs.openbsd.org 2003/06/12 12:22:47 6 - djm@cvs.openbsd.org 2003/06/12 12:22:47
7 [LICENCE] 7 [LICENCE]
8 mention more copyright holders; ok markus@ 8 mention more copyright holders; ok markus@
9 - nino@cvs.openbsd.org 2003/06/12 15:34:09
10 [scp.c]
11 Typo. Ok markus@.
9 12
1020030614 1320030614
11 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@ 14 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
@@ -521,4 +524,4 @@
521 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 524 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
522 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 525 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
523 526
524$Id: ChangeLog,v 1.2803 2003/06/18 10:26:13 djm Exp $ 527$Id: ChangeLog,v 1.2804 2003/06/18 10:26:34 djm Exp $
diff --git a/scp.c b/scp.c
index 16734875b..1cd0c55a4 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.105 2003/06/04 12:40:39 djm Exp $"); 74RCSID("$OpenBSD: scp.c,v 1.106 2003/06/12 15:34:09 nino Exp $");
75 75
76#include "xmalloc.h" 76#include "xmalloc.h"
77#include "atomicio.h" 77#include "atomicio.h"
@@ -151,7 +151,7 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
151 close(reserved[0]); 151 close(reserved[0]);
152 close(reserved[1]); 152 close(reserved[1]);
153 153
154 /* For a child to execute the command on the remote host using ssh. */ 154 /* Fork a child to execute the command on the remote host using ssh. */
155 do_cmd_pid = fork(); 155 do_cmd_pid = fork();
156 if (do_cmd_pid == 0) { 156 if (do_cmd_pid == 0) {
157 /* Child. */ 157 /* Child. */