upstream: ssh-agent.1: - use Nm not Xr for self-ref - while here,

wrap a long line

ssh-agent.c:
- add -O to usage()

OpenBSD-Commit-ID: 855dac4695cef22e96d69c53436496bc408ca389

diff --git a/ssh-agent.1 b/ssh-agent.1
index 9c5aec7064d663d59b8785a7a32f14c7a122d52c..b0bf65da88ef0c551ca1589839ad363923d379be 100644 (file)
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.74 2022/10/07 04:06:26 djm Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.75 2022/10/07 06:00:58 jmc Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -106,15 +106,15 @@ Kill the current agent (given by the
 environment variable).
 .It Fl O Ar option
 Specify an option when starting
-.Xr ssh-agent 1 .
+.Nm .
 Currently only one option is supported:
 .Cm no-restrict-websafe .
 This instructs
-.Xr ssh-agent 1
+.Nm
 to permit signatures using FIDO keys that might be web authentication
 requests.
 By default,
-.Xr ssh-agent 1
+.Nm
 refuses signature requests for FIDO keys where the key application string
 does not start with
 .Dq ssh:

diff --git a/ssh-agent.c b/ssh-agent.c
index 006ddad94ae11f6d328a5f2c92096a850ad627b9..44eb0a681c3ea98b46a1c922e54363f77605af87 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.292 2022/09/17 10:11:29 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.293 2022/10/07 06:00:58 jmc Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1992,9 +1992,9 @@ usage(void)
 {
        fprintf(stderr,
            "usage: ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]\n"
-           "                 [-P allowed_providers] [-t life]\n"
-           "       ssh-agent [-a bind_address] [-E fingerprint_hash] [-P allowed_providers]\n"
-           "                 [-t life] command [arg ...]\n"
+           "                 [-O option] [-P allowed_providers] [-t life]\n"
+           "       ssh-agent [-a bind_address] [-E fingerprint_hash] [-O option]\n"
+           "                 [-P allowed_providers] [-t life] command [arg ...]\n"
            "       ssh-agent [-c | -s] -k\n");
        exit(1);
 }