- OpenBSD CVS Sync

- mouring@cvs.openbsd.org 2001/07/18 16:45:52
     [scp.c]
     Missing -o in scp usage()
This commit is contained in:
Ben Lindstrom 2001-07-18 16:50:33 +00:00
parent a92783fbfa
commit dc00c93b6c
2 changed files with 7 additions and 3 deletions

View File

@ -19,6 +19,9 @@
[channels.c channels.h clientloop.c nchan.c serverloop.c] [channels.c channels.h clientloop.c nchan.c serverloop.c]
keep track of both maxfd and the size of the malloc'ed fdsets. keep track of both maxfd and the size of the malloc'ed fdsets.
update maxfd if maxfd gets closed. 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) Cleaned up trailing spaces in ChangeLog.
- (bal) Allow sshd to switch user context without password for Cygwin. - (bal) Allow sshd to switch user context without password for Cygwin.
Patch by Corinna Vinschen <vinschen@redhat.com> Patch by Corinna Vinschen <vinschen@redhat.com>
@ -6063,4 +6066,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

5
scp.c
View File

@ -75,7 +75,7 @@
*/ */
#include "includes.h" #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 "xmalloc.h"
#include "atomicio.h" #include "atomicio.h"
@ -950,7 +950,8 @@ void
usage() usage()
{ {
(void) fprintf(stderr, "usage: scp " (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"); " or: scp [options] f1 ... fn directory\n");
exit(1); exit(1);
} }