summaryrefslogtreecommitdiff
path: root/ssh-agent.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-12-20 00:22:52 +0000
committerColin Watson <cjwatson@debian.org>2016-12-20 00:22:52 +0000
commit971a7653746a6972b907dfe0ce139c06e4a6f482 (patch)
tree70fb964265d57ae4967be55b75dbb2a122e9b969 /ssh-agent.0
parenta8ed8d256b2e2c05b0c15565a7938028c5192277 (diff)
parent4a354fc231174901f2629437c2a6e924a2dd6772 (diff)
Import openssh_7.4p1.orig.tar.gz
Diffstat (limited to 'ssh-agent.0')
-rw-r--r--ssh-agent.012
1 files changed, 10 insertions, 2 deletions
diff --git a/ssh-agent.0 b/ssh-agent.0
index b6abf9b4e..bb3c8d605 100644
--- a/ssh-agent.0
+++ b/ssh-agent.0
@@ -5,7 +5,7 @@ NAME
5 5
6SYNOPSIS 6SYNOPSIS
7 ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash] 7 ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]
8 [-t life] [command [arg ...]] 8 [-P pkcs11_whitelist] [-t life] [command [arg ...]]
9 ssh-agent [-c | -s] -k 9 ssh-agent [-c | -s] -k
10 10
11DESCRIPTION 11DESCRIPTION
@@ -46,6 +46,14 @@ DESCRIPTION
46 -k Kill the current agent (given by the SSH_AGENT_PID environment 46 -k Kill the current agent (given by the SSH_AGENT_PID environment
47 variable). 47 variable).
48 48
49 -P pkcs11_whitelist
50 Specify a pattern-list of acceptable paths for PKCS#11 shared
51 libraries that may be added using the -s option to ssh-add(1).
52 The default is to allow loading PKCS#11 libraries from
53 M-bM-^@M-^\/usr/lib/*,/usr/local/lib/*M-bM-^@M-^]. PKCS#11 libraries that do not
54 match the whitelist will be refused. See PATTERNS in
55 ssh_config(5) for a description of pattern-list syntax.
56
49 -s Generate Bourne shell commands on stdout. This is the default if 57 -s Generate Bourne shell commands on stdout. This is the default if
50 SHELL does not look like it's a csh style of shell. 58 SHELL does not look like it's a csh style of shell.
51 59
@@ -109,4 +117,4 @@ AUTHORS
109 created OpenSSH. Markus Friedl contributed the support for SSH protocol 117 created OpenSSH. Markus Friedl contributed the support for SSH protocol
110 versions 1.5 and 2.0. 118 versions 1.5 and 2.0.
111 119
112OpenBSD 6.0 November 15, 2015 OpenBSD 6.0 120OpenBSD 6.0 November 30, 2016 OpenBSD 6.0