Change the default of 'user-config' to merge.

 * This allows user configured PKCS#11 modules by default.
 * Admins can change this to 'none' in /etc/pkcs11/pkcs11.conf
   to go back to the previous behavior.
 * Posted to the mailing list.

diff --git a/doc/p11-kit-config.xml b/doc/p11-kit-config.xml
index a10cb7e07a804ab707ccb8c3701f4278eb48b01a..b6fb48020033fdac3e9a629e1e1b3a5d0e2589a8 100644 (file)
--- a/doc/p11-kit-config.xml
+++ b/doc/p11-kit-config.xml
@@ -32,8 +32,8 @@
 <programlisting>
 # This setting controls whether to load user configuration from the
 # ~/.pkcs11 directory. Possible values:
-#    none: No user configuration (default)
-#    merge: Merge the user configuration over the system configuration
+#    none: No user configuration
+#    merge: Merge the user config over the system configuration (default)
 #    only: Only user configuration, ignore system configuration
 user-config: merge
 </programlisting>

diff --git a/p11-kit/conf.c b/p11-kit/conf.c
index db730a7222fbce8c9b974bb501751edc81af76d6..42611f8d8451a179f6eadbf063cce9620e238cb3 100644 (file)
--- a/p11-kit/conf.c
+++ b/p11-kit/conf.c
@@ -401,7 +401,7 @@ _p11_conf_load_globals (const char *system_conf, const char *user_conf,
                goto finished;
 
        /* Whether we should use or override from user directory */
-       mode = user_config_mode (config, CONF_USER_NONE);
+       mode = user_config_mode (config, CONF_USER_MERGE);
        if (mode == CONF_USER_INVALID) {
                error = EINVAL;
                goto finished;

diff --git a/p11-kit/pkcs11.conf.example.in b/p11-kit/pkcs11.conf.example.in
index ec01b148aa38fa40dc0012b5069ab11fc863a89a..a148000cee3238b7c91d3302454e133ab91e844a 100644 (file)
--- a/p11-kit/pkcs11.conf.example.in
+++ b/p11-kit/pkcs11.conf.example.in
@@ -3,7 +3,7 @@
 
 # This setting controls whether to load user configuration from the
 # ~/.pkcs11 directory. Possible values:
-#    none: No user configuration (default)
-#    merge: Merge the user configuration over the system configuration
+#    none: No user configuration
+#    merge: Merge the user config over the system configuration (default)
 #    only: Only user configuration, ignore system configuration
 user-config: merge