- OpenBSD CVS Sync

   - mouring@cvs.openbsd.org 2001/07/18 16:45:52
     [scp.c]
     Missing -o in scp usage()

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d43317df9..f778d4227 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
      [channels.c channels.h clientloop.c nchan.c serverloop.c]
      keep track of both maxfd and the size of the malloc'ed fdsets.
      update maxfd if maxfd gets closed.
+   - mouring@cvs.openbsd.org 2001/07/18 16:45:52
+     [scp.c]
+     Missing -o in scp usage()
  - (bal) Cleaned up trailing spaces in ChangeLog.
  - (bal) Allow sshd to switch user context without password for Cygwin.
          Patch by Corinna Vinschen <vinschen@redhat.com>
@@ -6063,4 +6066,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1413 2001/07/18 16:27:31 mouring Exp $
+$Id: ChangeLog,v 1.1414 2001/07/18 16:50:33 mouring Exp $
diff --git a/scp.c b/scp.c
index e5e3a97b8..daa3f9909 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.76 2001/06/23 15:12:19 itojun Exp $");
+RCSID("$OpenBSD: scp.c,v 1.77 2001/07/18 16:45:52 mouring Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -950,7 +950,8 @@ void
 usage()
 {
         (void) fprintf(stderr, "usage: scp "
-            "[-pqrvBC46] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2\n"
+            "[-pqrvBC46] [-S ssh] [-P port] [-c cipher] [-i identity] "
+            "[-o option] f1 f2\n"
             "   or: scp [options] f1 ... fn directory\n");
         exit(1);
 }