upstream: sort -H and -h in SYNOPSIS/usage(); tweak the -H text;

ok djm

OpenBSD-Commit-ID: 90721643e41e9e09deb5b776aaa0443456ab0965
This commit is contained in:
jmc@openbsd.org 2021-12-22 06:56:41 +00:00 committed by Damien Miller
parent 1c9853a68b
commit 0074aa2c8d
2 changed files with 9 additions and 9 deletions

View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-add.1,v 1.82 2021/12/19 22:14:12 djm Exp $
.\" $OpenBSD: ssh-add.1,v 1.83 2021/12/22 06:56:41 jmc Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -35,7 +35,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd $Mdocdate: December 19 2021 $
.Dd $Mdocdate: December 22 2021 $
.Dt SSH-ADD 1
.Os
.Sh NAME
@ -45,10 +45,10 @@
.Nm ssh-add
.Op Fl cDdKkLlqvXx
.Op Fl E Ar fingerprint_hash
.Op Fl S Ar provider
.Op Fl t Ar life
.Op Fl H Ar hostkey_file
.Op Fl h Ar destination_constraint
.Op Fl S Ar provider
.Op Fl t Ar life
.Op Ar
.Nm ssh-add
.Fl s Ar pkcs11
@ -132,8 +132,8 @@ The default is
Remove keys provided by the PKCS#11 shared library
.Ar pkcs11 .
.It Fl H Ar hostkey_file
Specifies a known hosts file to lookup hostkeys when using destination-
constained keys via the
Specifies a known hosts file to look up hostkeys when using
destination-constrained keys via the
.Fl h
flag.
This option may be specified multiple times to allow multiple files to be

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-add.c,v 1.162 2021/12/19 22:10:24 djm Exp $ */
/* $OpenBSD: ssh-add.c,v 1.163 2021/12/22 06:56:41 jmc Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -772,8 +772,8 @@ static void
usage(void)
{
fprintf(stderr,
"usage: ssh-add [-cDdKkLlqvXx] [-E fingerprint_hash] [-S provider] [-t life]\n"
" [-H hostkey_file] [-h destination]\n"
"usage: ssh-add [-cDdKkLlqvXx] [-E fingerprint_hash] [-H hostkey_file]\n"
" [-h destination_constraint] [-S provider] [-t life]\n"
#ifdef WITH_XMSS
" [-M maxsign] [-m minleft]\n"
#endif