mirror of
https://github.com/openbsd/src.git
synced 2026-06-18 07:13:36 +02:00
add a -V flag to print the version, but mostly as a way to check
the binary is functional; ok deraadt@
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
.\" $OpenBSD: ssh-agent.1,v 1.86 2025/10/04 21:41:35 naddy Exp $
|
||||
.\" $OpenBSD: ssh-agent.1,v 1.87 2026/05/27 03:04:30 djm Exp $
|
||||
.\"
|
||||
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
@@ -34,7 +34,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: October 4 2025 $
|
||||
.Dd $Mdocdate: May 27 2026 $
|
||||
.Dt SSH-AGENT 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
@@ -62,6 +62,8 @@
|
||||
.Fl k
|
||||
.Nm ssh-agent
|
||||
.Fl u
|
||||
.Nm ssh-agent
|
||||
.Fl V
|
||||
.Sh DESCRIPTION
|
||||
.Nm
|
||||
is a program to hold private keys used for public key authentication.
|
||||
@@ -208,6 +210,8 @@ If a command (and optional arguments) is given,
|
||||
this is executed as a subprocess of the agent.
|
||||
The agent exits automatically when the command given on the command
|
||||
line terminates.
|
||||
.It Fl V
|
||||
Display the version number and exit.
|
||||
.El
|
||||
.Pp
|
||||
There are two main ways to get an agent set up.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ssh-agent.c,v 1.325 2026/04/28 21:32:05 djm Exp $ */
|
||||
/* $OpenBSD: ssh-agent.c,v 1.326 2026/05/27 03:04:30 djm Exp $ */
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
@@ -77,6 +77,7 @@
|
||||
#include "ssh-pkcs11.h"
|
||||
#include "sk-api.h"
|
||||
#include "myproposal.h"
|
||||
#include "version.h"
|
||||
|
||||
#ifndef DEFAULT_ALLOWED_PROVIDERS
|
||||
# define DEFAULT_ALLOWED_PROVIDERS "/usr/lib*/*,/usr/local/lib*/*"
|
||||
@@ -2253,7 +2254,7 @@ main(int ac, char **av)
|
||||
if (getrlimit(RLIMIT_NOFILE, &rlim) == -1)
|
||||
fatal("%s: getrlimit: %s", __progname, strerror(errno));
|
||||
|
||||
while ((ch = getopt(ac, av, "cDdksTuUE:a:O:P:t:")) != -1) {
|
||||
while ((ch = getopt(ac, av, "cDdksTuUVE:a:O:P:t:")) != -1) {
|
||||
switch (ch) {
|
||||
case 'E':
|
||||
fingerprint_hash = ssh_digest_alg_by_name(optarg);
|
||||
@@ -2319,6 +2320,10 @@ main(int ac, char **av)
|
||||
case 'U':
|
||||
U_flag++;
|
||||
break;
|
||||
case 'V':
|
||||
fprintf(stderr, "%s, %s\n",
|
||||
SSH_VERSION, SSH_OPENSSL_VERSION);
|
||||
exit(0);
|
||||
default:
|
||||
usage();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user