Marcus Meissner
bbdcb346df
Fixed several bugs and cleaned up changes and specfile OBS-URL: https://build.opensuse.org/request/show/247627 OBS-URL: https://build.opensuse.org/package/show/security/openCryptoki?expand=0&rev=21
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
From 417e55a76a3a52dfb22f0055230c74b083d9e3a7 Mon Sep 17 00:00:00 2001
|
|
From: Joy Latten <jmlatten@linux.vnet.ibm.com>
|
|
Date: Fri, 29 Aug 2014 12:40:35 -0500
|
|
Subject: [PATCH] Man page corrections.
|
|
|
|
Remove references to obsoleted pk_config_data and pkcs11_startup
|
|
in the pkcsslotd man page. Other changes made as necessary.
|
|
|
|
Signed-off-by: Joy Latten <jmlatten@linux.vnet.ibm.com>
|
|
---
|
|
man/man5/opencryptoki.conf.5.in | 12 +++++++++++-
|
|
man/man8/pkcsslotd.8.in | 6 ++----
|
|
2 files changed, 13 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/man/man5/opencryptoki.conf.5.in b/man/man5/opencryptoki.conf.5.in
|
|
index e13c110..f3aabd1 100644
|
|
--- a/man/man5/opencryptoki.conf.5.in
|
|
+++ b/man/man5/opencryptoki.conf.5.in
|
|
@@ -3,7 +3,7 @@
|
|
opencryptoki.conf \- Configuration file for pkcsslotd.
|
|
|
|
.SH DESCRIPTION
|
|
-pkcsslotd uses a configuration file at "@sysconfdir@"/opencryptoki.conf
|
|
+pkcsslotd uses a configuration file at @sysconfdir@/opencryptoki/opencryptoki.conf
|
|
|
|
This is a text file that contains information used to configure
|
|
pkcs#11 slots. At startup, the pkcsslotd daemon parses this file to
|
|
@@ -51,6 +51,16 @@ Version number of the slot's firmware, if any. The version number is composed
|
|
of a major version number (the integer portion of the version) and a
|
|
minor version number (the hundredths portion of the version).
|
|
.TP
|
|
+.BR confname
|
|
+If the slot is associated with a token that has its own configuration file,
|
|
+this option identifies the name of that configuration file.
|
|
+For example, confname=ep11tok.conf
|
|
+
|
|
+.SH Notes
|
|
+The pound sign ('#') is used to indicate a comment.
|
|
+Both the comment character and any text after it, up to the end of the line,
|
|
+are ignored. The comment character cannot be used inside the brackets of
|
|
+slot descriptions, as this will cause a syntax error.
|
|
|
|
.SH "SEE ALSO"
|
|
.PD 0
|
|
diff --git a/man/man8/pkcsslotd.8.in b/man/man8/pkcsslotd.8.in
|
|
index c5d7280..db113e9 100644
|
|
--- a/man/man8/pkcsslotd.8.in
|
|
+++ b/man/man8/pkcsslotd.8.in
|
|
@@ -29,9 +29,7 @@ manual page for details.
|
|
.TP
|
|
\fBopencryptoki\fP(7),
|
|
.TP
|
|
-\fBpkcsconf\fP(1),
|
|
-.TP
|
|
-\fBpk_config_data\fP(5),
|
|
+\fBopencryptoki.conf\fP(5),
|
|
.TP
|
|
-\fBpkcs11_startup\fP(1).
|
|
+\fBpkcsconf\fP(1),
|
|
.PD
|
|
--
|
|
1.8.1.4
|
|
|