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 @@
    - markus@cvs.openbsd.org 2004/03/09 22:11:05
      [ssh.c]
      increase x11 cookie lifetime to 20 minutes; ok djm
+   - markus@cvs.openbsd.org 2004/03/10 09:45:06
+     [ssh.c]
+     trim usage to match ssh(1) and look more like unix. ok djm@
 
 20040311
  - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker
@@ -905,4 +908,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3290 2004/03/21 22:34:26 djm Exp $
+$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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.207 2004/03/09 22:11:05 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.208 2004/03/10 09:45:06 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -146,49 +146,12 @@ pid_t proxy_command_pid = 0;
 static void
 usage(void)
 {
-        fprintf(stderr, "Usage: %s [options] host [command]\n", __progname);
-        fprintf(stderr, "Options:\n");
-        fprintf(stderr, "  -l user     Log in using this user name.\n");
-        fprintf(stderr, "  -n          Redirect input from " _PATH_DEVNULL ".\n");
-        fprintf(stderr, "  -F config   Config file (default: ~/%s).\n",
-             _PATH_SSH_USER_CONFFILE);
-        fprintf(stderr, "  -A          Enable authentication agent forwarding.\n");
-        fprintf(stderr, "  -a          Disable authentication agent forwarding (default).\n");
-        fprintf(stderr, "  -X          Enable X11 connection forwarding.\n");
-        fprintf(stderr, "  -Y          Enable trusted X11 connection forwarding.\n");
-        fprintf(stderr, "  -x          Disable X11 connection forwarding (default).\n");
-        fprintf(stderr, "  -i file     Identity for public key authentication "
-            "(default: ~/.ssh/identity)\n");
-#ifdef SMARTCARD
-        fprintf(stderr, "  -I reader   Set smartcard reader.\n");
-#endif
-        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");
-        fprintf(stderr, "              Multiple -v increases verbosity.\n");
-        fprintf(stderr, "  -V          Display version number only.\n");
-        fprintf(stderr, "  -q          Quiet; don't display any warning messages.\n");
-        fprintf(stderr, "  -f          Fork into background after authentication.\n");
-        fprintf(stderr, "  -e char     Set escape character; ``none'' = disable (default: ~).\n");
-
-        fprintf(stderr, "  -c cipher   Select encryption algorithm\n");
-        fprintf(stderr, "  -m macs     Specify MAC algorithms for protocol version 2.\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");
-        fprintf(stderr, "              These cause %s to listen for connections on a port, and\n", __progname);
-        fprintf(stderr, "              forward them to the other side by connecting to host:port.\n");
-        fprintf(stderr, "  -D port     Enable dynamic application-level port forwarding.\n");
-        fprintf(stderr, "  -C          Enable compression.\n");
-        fprintf(stderr, "  -N          Do not execute a shell or command.\n");
-        fprintf(stderr, "  -g          Allow remote hosts to connect to forwarded ports.\n");
-        fprintf(stderr, "  -1          Force protocol version 1.\n");
-        fprintf(stderr, "  -2          Force protocol version 2.\n");
-        fprintf(stderr, "  -4          Use IPv4 only.\n");
-        fprintf(stderr, "  -6          Use IPv6 only.\n");
-        fprintf(stderr, "  -o 'option' Process the option as if it was read from a configuration file.\n");
-        fprintf(stderr, "  -s          Invoke command (mandatory) as SSH2 subsystem.\n");
-        fprintf(stderr, "  -b addr     Local IP address.\n");
+        fprintf(stderr,
+"usage: ssh [-1246AaCfghkNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
+"           [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n"
+"           [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option]\n"
+"           [-p port] [-R port:host:hostport] [user@]hostname [command]\n"
+        );
         exit(1);
 }