From b408786db92c76bcff026c22e256d8b3485309ad Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 22 Mar 2004 09:35:21 +1100 Subject: - markus@cvs.openbsd.org 2004/03/11 08:36:26 [sshd.c] trim usage; ok deraadt --- ChangeLog | 5 ++++- sshd.c | 24 +++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86c1855f..a121ba1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ - 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@ + - markus@cvs.openbsd.org 2004/03/11 08:36:26 + [sshd.c] + trim usage; ok deraadt 20040311 - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker @@ -908,4 +911,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.3291 2004/03/21 22:34:58 djm Exp $ +$Id: ChangeLog,v 1.3292 2004/03/21 22:35:21 djm Exp $ diff --git a/sshd.c b/sshd.c index 3308a8dc..b9331566 100644 --- a/sshd.c +++ b/sshd.c @@ -42,7 +42,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.288 2004/03/03 06:47:52 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.289 2004/03/11 08:36:26 markus Exp $"); #include #include @@ -765,24 +765,10 @@ usage(void) { fprintf(stderr, "sshd version %s, %s\n", SSH_VERSION, SSLeay_version(SSLEAY_VERSION)); - fprintf(stderr, "Usage: %s [options]\n", __progname); - fprintf(stderr, "Options:\n"); - fprintf(stderr, " -f file Configuration file (default %s)\n", _PATH_SERVER_CONFIG_FILE); - fprintf(stderr, " -d Debugging mode (multiple -d means more debugging)\n"); - fprintf(stderr, " -i Started from inetd\n"); - fprintf(stderr, " -D Do not fork into daemon mode\n"); - fprintf(stderr, " -t Only test configuration file and keys\n"); - fprintf(stderr, " -q Quiet (no logging)\n"); - fprintf(stderr, " -p port Listen on the specified port (default: 22)\n"); - fprintf(stderr, " -k seconds Regenerate server key every this many seconds (default: 3600)\n"); - fprintf(stderr, " -g seconds Grace period for authentication (default: 600)\n"); - fprintf(stderr, " -b bits Size of server RSA key (default: 768 bits)\n"); - fprintf(stderr, " -h file File from which to read host key (default: %s)\n", - _PATH_HOST_KEY_FILE); - fprintf(stderr, " -u len Maximum hostname length for utmp recording\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, +"usage: sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]\n" +" [-h host_key_file] [-k key_gen_time] [-o option] [-p port] [-u len]\n" + ); exit(1); } -- cgit v1.2.3