summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 347fd1803..b3d777ac4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,9 @@
56 [servconf.c sshd_config.5] 56 [servconf.c sshd_config.5]
57 support setting PermitEmptyPasswords in a Match block 57 support setting PermitEmptyPasswords in a Match block
58 requested in PR3891; ok dtucker@ 58 requested in PR3891; ok dtucker@
59 - jmc@cvs.openbsd.org 2008/10/09 06:54:22
60 [ssh.c]
61 add -y to usage();
59 62
6020080906 6320080906
61 - (dtucker) [config.guess config.sub] Update to latest versions from 64 - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4790,4 +4793,4 @@
4790 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4793 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4791 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4794 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4792 4795
4793$Id: ChangeLog,v 1.5111 2008/11/03 08:23:10 djm Exp $ 4796$Id: ChangeLog,v 1.5112 2008/11/03 08:23:28 djm Exp $
diff --git a/ssh.c b/ssh.c
index ff47a6c28..82d3ab26b 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.320 2008/10/08 23:34:03 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.321 2008/10/09 06:54:22 jmc Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -179,7 +179,7 @@ static void
179usage(void) 179usage(void)
180{ 180{
181 fprintf(stderr, 181 fprintf(stderr,
182"usage: ssh [-1246AaCfgKkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" 182"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
183" [-D [bind_address:]port] [-e escape_char] [-F configfile]\n" 183" [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"
184" [-i identity_file] [-L [bind_address:]port:host:hostport]\n" 184" [-i identity_file] [-L [bind_address:]port:host:hostport]\n"
185" [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" 185" [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"