summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2014-12-18 12:25:06 +0000
committerGert Doering <gert@greenie.muc.de>2014-12-27 15:19:15 +0100
commit7c1d614c5c5282a73cb799f919eac6750363783a (patch)
treeec2191fd345c7352f566a6b3e58087b537bdbe2a /doc
parent3c6d32205db88348c07c720b710b41548497819c (diff)
downloadopenvpn-7c1d614c5c5282a73cb799f919eac6750363783a.tar.gz
openvpn-7c1d614c5c5282a73cb799f919eac6750363783a.tar.xz
openvpn-7c1d614c5c5282a73cb799f919eac6750363783a.zip
Make 'provider' option to --show-pkcs11-ids optional where p11-kit is present
Trac: 490 Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Acked-by: Steffan Karger <steffan.karger@fox-it.com> Message-Id: <1418905506.21260.6.camel@infradead.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/9355 Signed-off-by: Gert Doering <gert@greenie.muc.de> (cherry picked from commit a91a06cb291414c9e657377e44f7a57343ae7f5a)
Diffstat (limited to 'doc')
-rw-r--r--doc/openvpn.88
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/openvpn.8 b/doc/openvpn.8
index 0bdea1f..49183ee 100644
--- a/doc/openvpn.8
+++ b/doc/openvpn.8
@@ -5490,11 +5490,17 @@ adapter list.
.SS PKCS#11 Standalone Options:
.\"*********************************************************
.TP
-.B \-\-show-pkcs11-ids provider [cert_private]
+.B \-\-show-pkcs11-ids [provider] [cert_private]
(Standalone)
Show PKCS#11 token object list. Specify cert_private as 1
if certificates are stored as private objects.
+If p11-kit is present on the system, the
+.B provider
+argument is optional; if omitted the default
+.B p11-kit-proxy.so
+module will be queried.
+
.B \-\-verb
option can be used BEFORE this option to produce debugging information.
.\"*********************************************************