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. --- p11-kit/conf.c | 2 +- p11-kit/pkcs11.conf.example.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'p11-kit') diff --git a/p11-kit/conf.c b/p11-kit/conf.c index db730a7..42611f8 100644 --- 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 ec01b14..a148000 100644 --- 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 -- cgit v1.1