diff options
author | Damien Miller <djm@mindrot.org> | 2004-03-22 09:35:21 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-03-22 09:35:21 +1100 |
commit | b408786db92c76bcff026c22e256d8b3485309ad (patch) | |
tree | 3a25c9f6bee30aad362f87353f670d39ce609168 | |
parent | 5095510e5f7516bc92b26f88a08042f86ef97f61 (diff) |
- markus@cvs.openbsd.org 2004/03/11 08:36:26
[sshd.c]
trim usage; ok deraadt
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.c | 24 |
2 files changed, 9 insertions, 20 deletions
@@ -7,6 +7,9 @@ | |||
7 | - markus@cvs.openbsd.org 2004/03/10 09:45:06 | 7 | - markus@cvs.openbsd.org 2004/03/10 09:45:06 |
8 | [ssh.c] | 8 | [ssh.c] |
9 | trim usage to match ssh(1) and look more like unix. ok djm@ | 9 | trim usage to match ssh(1) and look more like unix. ok djm@ |
10 | - markus@cvs.openbsd.org 2004/03/11 08:36:26 | ||
11 | [sshd.c] | ||
12 | trim usage; ok deraadt | ||
10 | 13 | ||
11 | 20040311 | 14 | 20040311 |
12 | - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker | 15 | - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker |
@@ -908,4 +911,4 @@ | |||
908 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 911 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
909 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 912 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
910 | 913 | ||
911 | $Id: ChangeLog,v 1.3291 2004/03/21 22:34:58 djm Exp $ | 914 | $Id: ChangeLog,v 1.3292 2004/03/21 22:35:21 djm Exp $ |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.288 2004/03/03 06:47:52 markus Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.289 2004/03/11 08:36:26 markus Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -765,24 +765,10 @@ usage(void) | |||
765 | { | 765 | { |
766 | fprintf(stderr, "sshd version %s, %s\n", | 766 | fprintf(stderr, "sshd version %s, %s\n", |
767 | SSH_VERSION, SSLeay_version(SSLEAY_VERSION)); | 767 | SSH_VERSION, SSLeay_version(SSLEAY_VERSION)); |
768 | fprintf(stderr, "Usage: %s [options]\n", __progname); | 768 | fprintf(stderr, |
769 | fprintf(stderr, "Options:\n"); | 769 | "usage: sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]\n" |
770 | fprintf(stderr, " -f file Configuration file (default %s)\n", _PATH_SERVER_CONFIG_FILE); | 770 | " [-h host_key_file] [-k key_gen_time] [-o option] [-p port] [-u len]\n" |
771 | fprintf(stderr, " -d Debugging mode (multiple -d means more debugging)\n"); | 771 | ); |
772 | fprintf(stderr, " -i Started from inetd\n"); | ||
773 | fprintf(stderr, " -D Do not fork into daemon mode\n"); | ||
774 | fprintf(stderr, " -t Only test configuration file and keys\n"); | ||
775 | fprintf(stderr, " -q Quiet (no logging)\n"); | ||
776 | fprintf(stderr, " -p port Listen on the specified port (default: 22)\n"); | ||
777 | fprintf(stderr, " -k seconds Regenerate server key every this many seconds (default: 3600)\n"); | ||
778 | fprintf(stderr, " -g seconds Grace period for authentication (default: 600)\n"); | ||
779 | fprintf(stderr, " -b bits Size of server RSA key (default: 768 bits)\n"); | ||
780 | fprintf(stderr, " -h file File from which to read host key (default: %s)\n", | ||
781 | _PATH_HOST_KEY_FILE); | ||
782 | fprintf(stderr, " -u len Maximum hostname length for utmp recording\n"); | ||
783 | fprintf(stderr, " -4 Use IPv4 only\n"); | ||
784 | fprintf(stderr, " -6 Use IPv6 only\n"); | ||
785 | fprintf(stderr, " -o option Process the option as if it was read from a configuration file.\n"); | ||
786 | exit(1); | 772 | exit(1); |
787 | } | 773 | } |
788 | 774 | ||