diff options
| author | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
| commit | 99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (patch) | |
| tree | 1d24ce54c9981ea8cbb4c5a9309964a0e4c4b320 /scp.c | |
| parent | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (diff) | |
| parent | 54af7a4ae8d455791a631bdfaade4b64436ae16a (diff) | |
import openssh-5.2p1-gsskex-all-20090726.patch
Diffstat (limited to 'scp.c')
| -rw-r--r-- | scp.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -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) |