summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-05 06:45:21 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-05 06:45:21 +0000
commit0ab2a010794017a7a1314faade2adcdb116e0544 (patch)
tree3b0666df1eebaa24e3ff2a3f1c792bef7da584d6
parentcf0da4067bc7dc51f3f7bef7ff08b49b3e5af448 (diff)
- deraadt@cvs.openbsd.org 2001/03/01 02:29:04
[ssh.c] shorten usage by a line
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c9
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 915c3a0d..b6b20326 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,9 @@
- deraadt@cvs.openbsd.org 2001/03/01 02:11:25
[authfd.c]
split line so that p will have an easier time next time around
+ - deraadt@cvs.openbsd.org 2001/03/01 02:29:04
+ [ssh.c]
+ shorten usage by a line
20010304
- (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4289,4 +4292,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.881 2001/03/05 06:42:58 mouring Exp $
+$Id: ChangeLog,v 1.882 2001/03/05 06:45:21 mouring Exp $
diff --git a/ssh.c b/ssh.c
index ec6f30e5..cf6b0379 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.98 2001/02/22 21:59:44 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.99 2001/03/01 02:29:04 deraadt Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -161,8 +161,8 @@ usage(void)
#endif /* AFS */
fprintf(stderr, " -X Enable X11 connection forwarding.\n");
fprintf(stderr, " -x Disable X11 connection forwarding.\n");
- fprintf(stderr, " -i file Identity for public key authentication\n");
- fprintf(stderr, " (default: ~/.ssh/identity).\n");
+ fprintf(stderr, " -i file Identity for public key authentication "
+ "(default: ~/.ssh/identity)\n");
fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n");
fprintf(stderr, " -T Do not allocate a tty.\n");
fprintf(stderr, " -v Verbose; display verbose debugging messages.\n");
@@ -174,8 +174,7 @@ usage(void)
fprintf(stderr, " -e char Set escape character; ``none'' = disable (default: ~).\n");
fprintf(stderr, " -c cipher Select encryption algorithm: "
- "``3des'', "
- "``blowfish''\n");
+ "``3des'', ``blowfish''\n");
fprintf(stderr, " -p port Connect to this port. Server must be on the same port.\n");
fprintf(stderr, " -L listen-port:host:port Forward local port to remote address\n");
fprintf(stderr, " -R listen-port:host:port Forward remote port to local address\n");