diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | scp.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -59,6 +59,9 @@ | |||
59 | - jmc@cvs.openbsd.org 2008/10/09 06:54:22 | 59 | - jmc@cvs.openbsd.org 2008/10/09 06:54:22 |
60 | [ssh.c] | 60 | [ssh.c] |
61 | add -y to usage(); | 61 | add -y to usage(); |
62 | - stevesk@cvs.openbsd.org 2008/10/10 04:55:16 | ||
63 | [scp.c] | ||
64 | spelling in comment; ok djm@ | ||
62 | 65 | ||
63 | 20080906 | 66 | 20080906 |
64 | - (dtucker) [config.guess config.sub] Update to latest versions from | 67 | - (dtucker) [config.guess config.sub] Update to latest versions from |
@@ -4793,4 +4796,4 @@ | |||
4793 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4796 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4794 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4797 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4795 | 4798 | ||
4796 | $Id: ChangeLog,v 1.5112 2008/11/03 08:23:28 djm Exp $ | 4799 | $Id: ChangeLog,v 1.5113 2008/11/03 08:23:45 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: scp.c,v 1.163 2008/06/13 18:55:22 dtucker Exp $ */ | 1 | /* $OpenBSD: scp.c,v 1.164 2008/10/10 04:55:16 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * scp - secure remote copy. This is basically patched BSD rcp which | 3 | * scp - secure remote copy. This is basically patched BSD rcp which |
4 | * uses ssh to do the data transfer (instead of using rcmd). | 4 | * uses ssh to do the data transfer (instead of using rcmd). |
@@ -434,7 +434,7 @@ main(int argc, char **argv) | |||
434 | } | 434 | } |
435 | /* | 435 | /* |
436 | * Finally check the exit status of the ssh process, if one was forked | 436 | * Finally check the exit status of the ssh process, if one was forked |
437 | * and no error has occured yet | 437 | * and no error has occurred yet |
438 | */ | 438 | */ |
439 | if (do_cmd_pid != -1 && errs == 0) { | 439 | if (do_cmd_pid != -1 && errs == 0) { |
440 | if (remin != -1) | 440 | if (remin != -1) |