summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2012-04-01 21:53:04 +0200
committerStef Walter <stefw@gnome.org>2012-04-01 21:53:04 +0200
commita899d9be0cab72dcfe00f100527c52ea598fed70 (patch)
tree8b2e58d055a1cf8e5fced45195a3ffb598eef9c4 /doc
parentaf8d28014f97ab0d9e4d00961e72aefd7adb470b (diff)
Add enable-in and disable-in options to module config
* These can be used to load certain modules in certain programs, or prevent loading in others. * Useful for a key manager like seahorse, so we can load extra modules (think NSS) that other modules shouldn't load.
Diffstat (limited to 'doc')
-rw-r--r--doc/p11-kit-config.xml27
-rw-r--r--doc/p11-kit-sections.txt1
2 files changed, 28 insertions, 0 deletions
diff --git a/doc/p11-kit-config.xml b/doc/p11-kit-config.xml
index 7c28f86..11fb41f 100644
--- a/doc/p11-kit-config.xml
+++ b/doc/p11-kit-config.xml
@@ -140,8 +140,35 @@ critical: yes
<para>This argument is optional and defaults to <literal>no</literal>.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>enable-in:</term>
+ <listitem>
+ <para>A comma and/or space separated list of names of programs that
+ this module should only be loaded in. The module will not be loaded
+ for other programs using p11-kit. The base name of the process executable
+ should be used here, for example
+ <literal>seahorse, ssh</literal>.</para>
+ <para>This is not a security feature. The argument is optional. If
+ not present, then any process will load the module.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>disable-in:</term>
+ <listitem>
+ <para>A comma and/or space separated list of names of programs that
+ this module should not be loaded in. The module will be loaded for any
+ other programs using p11-kit. The base name of the process
+ executable should be used here, for example
+ <literal>firefox, thunderbird-bin</literal>.</para>
+ <para>This is not a security feature. The argument is optional. If
+ not present, then any process will load the module.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
+ <para>Do not specify both <literal>enable-in</literal> and <literal>disable-in</literal>
+ for the same module.</para>
+
<para>Other fields may be present, but it is recommended that field names
that are not specified in this document start with a <literal>x-</literal>
prefix.</para>
diff --git a/doc/p11-kit-sections.txt b/doc/p11-kit-sections.txt
index 37fceb5..bdd0434 100644
--- a/doc/p11-kit-sections.txt
+++ b/doc/p11-kit-sections.txt
@@ -81,6 +81,7 @@ p11_kit_uri_type_t
<SECTION>
<FILE>p11-kit-future</FILE>
+p11_kit_set_progname
p11_kit_be_quiet
p11_kit_message
</SECTION> \ No newline at end of file