diff options
Diffstat (limited to 'p11-kit/conf.c')
| -rw-r--r-- | p11-kit/conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |