summaryrefslogtreecommitdiff
path: root/p11-kit/conf.h
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2013-01-29 12:53:29 +0100
committerStef Walter <stefw@gnome.org>2013-02-05 09:42:34 +0100
commit85751aa21dd9b93d8eb51e36767b5564ce6ce005 (patch)
treeb84960ea526b426fc002643d5eb48809289853f4 /p11-kit/conf.h
parenta9790a21302f47016a88ba9a2c904bed11efb388 (diff)
Add a /usr/share/p11-kit/modules directory for package module configs
* Try to make /etc/pkcs11/modules for administrator use * Override the old pkg-config variables to help packages start using the new location
Diffstat (limited to 'p11-kit/conf.h')
-rw-r--r--p11-kit/conf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/p11-kit/conf.h b/p11-kit/conf.h
index 3895b0c..c4d7ae2 100644
--- a/p11-kit/conf.h
+++ b/p11-kit/conf.h
@@ -63,7 +63,8 @@ p11_dict * _p11_conf_load_globals (const char *system_conf,
int *user_mode);
/* Returns a hash of char* name -> hash_t *config */
-p11_dict * _p11_conf_load_modules (int user_mode,
+p11_dict * _p11_conf_load_modules (int user_mode,
+ const char *package_dir,
const char *system_dir,
const char *user_dir);