diff options
| author | Stef Walter <stefw@gnome.org> | 2012-09-06 11:01:57 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-09-06 11:08:26 +0200 |
| commit | bb6949da2fd071d879a13f8e24389fef697b451a (patch) | |
| tree | 6b1ff1dbe26fbdf69bdb681461031131d8048b03 | |
| parent | 56860b7f72c444eed5923e11d735b85b630a171d (diff) | |
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.
| -rw-r--r-- | doc/p11-kit-config.xml | 4 | ||||
| -rw-r--r-- | p11-kit/conf.c | 2 | ||||
| -rw-r--r-- | p11-kit/pkcs11.conf.example.in | 4 |
3 files changed, 5 insertions, 5 deletions
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 @@ <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 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 |