From 98c57f17f728e01152587a03b2de2f95dde5b57c Mon Sep 17 00:00:00 2001 From: jmc Date: Fri, 7 Oct 2022 06:00:58 +0000 Subject: [PATCH] ssh-agent.1: - use Nm not Xr for self-ref - while here, wrap a long line ssh-agent.c: - add -O to usage() --- usr.bin/ssh/ssh-agent.1 | 11 ++++++----- usr.bin/ssh/ssh-agent.c | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/usr.bin/ssh/ssh-agent.1 b/usr.bin/ssh/ssh-agent.1 index 2c6cd889aa3..b0bf65da88e 100644 --- a/usr.bin/ssh/ssh-agent.1 +++ b/usr.bin/ssh/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 .\" Copyright (c) 1995 Tatu Ylonen , 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: @@ -180,7 +180,8 @@ which in turn can be evaluated in the calling shell, for example .Pp In both cases, .Xr ssh 1 -looks at these environment variables and uses them to establish a connection to the agent. +looks at these environment variables +and uses them to establish a connection to the agent. .Pp The agent initially does not have any private keys. Keys are added using diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 9b0dcffad9b..40b0762135a 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1979,9 +1979,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); } -- 2.20.1