summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-07-18 16:50:33 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-07-18 16:50:33 +0000
commitdc00c93b6c7992efbc06660410b371cc3c9152b1 (patch)
tree06388312507c2a5a42c8f56b593df0553ef96dbd
parenta92783fbfa95403cf2040b3375ea20ff3a4e3345 (diff)
- OpenBSD CVS Sync
- mouring@cvs.openbsd.org 2001/07/18 16:45:52 [scp.c] Missing -o in scp usage()
-rw-r--r--ChangeLog5
-rw-r--r--scp.c5
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 @@
19 [channels.c channels.h clientloop.c nchan.c serverloop.c] 19 [channels.c channels.h clientloop.c nchan.c serverloop.c]
20 keep track of both maxfd and the size of the malloc'ed fdsets. 20 keep track of both maxfd and the size of the malloc'ed fdsets.
21 update maxfd if maxfd gets closed. 21 update maxfd if maxfd gets closed.
22 - mouring@cvs.openbsd.org 2001/07/18 16:45:52
23 [scp.c]
24 Missing -o in scp usage()
22 - (bal) Cleaned up trailing spaces in ChangeLog. 25 - (bal) Cleaned up trailing spaces in ChangeLog.
23 - (bal) Allow sshd to switch user context without password for Cygwin. 26 - (bal) Allow sshd to switch user context without password for Cygwin.
24 Patch by Corinna Vinschen <vinschen@redhat.com> 27 Patch by Corinna Vinschen <vinschen@redhat.com>
@@ -6063,4 +6066,4 @@
6063 - Wrote replacements for strlcpy and mkdtemp 6066 - Wrote replacements for strlcpy and mkdtemp
6064 - Released 1.0pre1 6067 - Released 1.0pre1
6065 6068
6066$Id: ChangeLog,v 1.1413 2001/07/18 16:27:31 mouring Exp $ 6069$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 @@
75 */ 75 */
76 76
77#include "includes.h" 77#include "includes.h"
78RCSID("$OpenBSD: scp.c,v 1.76 2001/06/23 15:12:19 itojun Exp $"); 78RCSID("$OpenBSD: scp.c,v 1.77 2001/07/18 16:45:52 mouring Exp $");
79 79
80#include "xmalloc.h" 80#include "xmalloc.h"
81#include "atomicio.h" 81#include "atomicio.h"
@@ -950,7 +950,8 @@ void
950usage() 950usage()
951{ 951{
952 (void) fprintf(stderr, "usage: scp " 952 (void) fprintf(stderr, "usage: scp "
953 "[-pqrvBC46] [-S ssh] [-P port] [-c cipher] [-i identity] f1 f2\n" 953 "[-pqrvBC46] [-S ssh] [-P port] [-c cipher] [-i identity] "
954 "[-o option] f1 f2\n"
954 " or: scp [options] f1 ... fn directory\n"); 955 " or: scp [options] f1 ... fn directory\n");
955 exit(1); 956 exit(1);
956} 957}