merged OPENSSH_5_2P1_GSSAPI_20090225 to GPT-branch

[gssapi-openssh.git] / openssh / scp.c

diff --git a/openssh/scp.c b/openssh/scp.c
index fd1bd42d526e744b74ce98e30caf3d8aa91e6ca6..86ba5b4cf6c09061a44a64655b6f46e62ef41d5e 100644 (file)
--- a/openssh/scp.c
+++ b/openssh/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.163 2008/06/13 18:55:22 dtucker Exp $ */
+/* $OpenBSD: scp.c,v 1.164 2008/10/10 04:55:16 stevesk Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -436,7 +436,7 @@ main(int argc, char **argv)
        }
        /*
         * Finally check the exit status of the ssh process, if one was forked
-        * and no error has occured yet
+        * and no error has occurred yet
         */
        if (do_cmd_pid != -1 && errs == 0) {
                if (remin != -1)