From bb6949da2fd071d879a13f8e24389fef697b451a Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Thu, 6 Sep 2012 11:01:57 +0200 Subject: 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. --- doc/p11-kit-config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/p11-kit-config.xml b/doc/p11-kit-config.xml index a10cb7e..b6fb480 100644 --- a/doc/p11-kit-config.xml +++ b/doc/p11-kit-config.xml @@ -32,8 +32,8 @@ # 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 -- cgit v1.1