summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c51
2 files changed, 11 insertions, 45 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c877f099..86c1855f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 - markus@cvs.openbsd.org 2004/03/09 22:11:05 4 - markus@cvs.openbsd.org 2004/03/09 22:11:05
5 [ssh.c] 5 [ssh.c]
6 increase x11 cookie lifetime to 20 minutes; ok djm 6 increase x11 cookie lifetime to 20 minutes; ok djm
7 - markus@cvs.openbsd.org 2004/03/10 09:45:06
8 [ssh.c]
9 trim usage to match ssh(1) and look more like unix. ok djm@
7 10
820040311 1120040311
9 - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker 12 - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker
@@ -905,4 +908,4 @@
905 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 908 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
906 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 909 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
907 910
908$Id: ChangeLog,v 1.3290 2004/03/21 22:34:26 djm Exp $ 911$Id: ChangeLog,v 1.3291 2004/03/21 22:34:58 djm Exp $
diff --git a/ssh.c b/ssh.c
index 87d22aab2..d4954ec37 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.207 2004/03/09 22:11:05 markus Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.208 2004/03/10 09:45:06 markus Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -146,49 +146,12 @@ pid_t proxy_command_pid = 0;
146static void 146static void
147usage(void) 147usage(void)
148{ 148{
149 fprintf(stderr, "Usage: %s [options] host [command]\n", __progname); 149 fprintf(stderr,
150 fprintf(stderr, "Options:\n"); 150"usage: ssh [-1246AaCfghkNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
151 fprintf(stderr, " -l user Log in using this user name.\n"); 151" [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n"
152 fprintf(stderr, " -n Redirect input from " _PATH_DEVNULL ".\n"); 152" [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option]\n"
153 fprintf(stderr, " -F config Config file (default: ~/%s).\n", 153" [-p port] [-R port:host:hostport] [user@]hostname [command]\n"
154 _PATH_SSH_USER_CONFFILE); 154 );
155 fprintf(stderr, " -A Enable authentication agent forwarding.\n");
156 fprintf(stderr, " -a Disable authentication agent forwarding (default).\n");
157 fprintf(stderr, " -X Enable X11 connection forwarding.\n");
158 fprintf(stderr, " -Y Enable trusted X11 connection forwarding.\n");
159 fprintf(stderr, " -x Disable X11 connection forwarding (default).\n");
160 fprintf(stderr, " -i file Identity for public key authentication "
161 "(default: ~/.ssh/identity)\n");
162#ifdef SMARTCARD
163 fprintf(stderr, " -I reader Set smartcard reader.\n");
164#endif
165 fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n");
166 fprintf(stderr, " -T Do not allocate a tty.\n");
167 fprintf(stderr, " -v Verbose; display verbose debugging messages.\n");
168 fprintf(stderr, " Multiple -v increases verbosity.\n");
169 fprintf(stderr, " -V Display version number only.\n");
170 fprintf(stderr, " -q Quiet; don't display any warning messages.\n");
171 fprintf(stderr, " -f Fork into background after authentication.\n");
172 fprintf(stderr, " -e char Set escape character; ``none'' = disable (default: ~).\n");
173
174 fprintf(stderr, " -c cipher Select encryption algorithm\n");
175 fprintf(stderr, " -m macs Specify MAC algorithms for protocol version 2.\n");
176 fprintf(stderr, " -p port Connect to this port. Server must be on the same port.\n");
177 fprintf(stderr, " -L listen-port:host:port Forward local port to remote address\n");
178 fprintf(stderr, " -R listen-port:host:port Forward remote port to local address\n");
179 fprintf(stderr, " These cause %s to listen for connections on a port, and\n", __progname);
180 fprintf(stderr, " forward them to the other side by connecting to host:port.\n");
181 fprintf(stderr, " -D port Enable dynamic application-level port forwarding.\n");
182 fprintf(stderr, " -C Enable compression.\n");
183 fprintf(stderr, " -N Do not execute a shell or command.\n");
184 fprintf(stderr, " -g Allow remote hosts to connect to forwarded ports.\n");
185 fprintf(stderr, " -1 Force protocol version 1.\n");
186 fprintf(stderr, " -2 Force protocol version 2.\n");
187 fprintf(stderr, " -4 Use IPv4 only.\n");
188 fprintf(stderr, " -6 Use IPv6 only.\n");
189 fprintf(stderr, " -o 'option' Process the option as if it was read from a configuration file.\n");
190 fprintf(stderr, " -s Invoke command (mandatory) as SSH2 subsystem.\n");
191 fprintf(stderr, " -b addr Local IP address.\n");
192 exit(1); 155 exit(1);
193} 156}
194 157