diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-01-30 08:26:23 -0600 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-01-30 08:26:23 -0600 |
| commit | 14dfb79ca65dd80e117103c4f8852ae2b4a419a0 (patch) | |
| tree | 2b568bac82b2dae2299e9030686b7f5c78da7c3d /module/p11-kit-lib.c | |
| parent | 4375e297b19bc2177e17cc5616e75d96be053328 (diff) | |
Configuration tests.
Diffstat (limited to 'module/p11-kit-lib.c')
| -rw-r--r-- | module/p11-kit-lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/module/p11-kit-lib.c b/module/p11-kit-lib.c index 1b7a99c..a244203 100644 --- a/module/p11-kit-lib.c +++ b/module/p11-kit-lib.c @@ -101,8 +101,8 @@ warning (const char* msg, ...) va_end (va); } -void -conf_error (const char *filename, const char *buffer) +static void +conf_error (const char *buffer) { /* called from conf.c */ fprintf (stderr, "p11-kit: %s\n", buffer); @@ -184,7 +184,7 @@ load_module_from_config_unlocked (const char *configfile, const char *name) if (!module) return CKR_HOST_MEMORY; - module->config = conf_parse_file (configfile, 0); + module->config = conf_parse_file (configfile, 0, conf_error); if (!module->config) { free_module_unlocked (module); if (errno == ENOMEM) @@ -335,7 +335,7 @@ load_registered_modules_unlocked (void) assert (!gl.config); /* Load the main configuration */ - config = conf_parse_file (PKCS11_CONFIG_FILE, CONF_IGNORE_MISSING); + config = conf_parse_file (PKCS11_CONFIG_FILE, CONF_IGNORE_MISSING, conf_error); if (!config) { if (errno == ENOMEM) return CKR_HOST_MEMORY; |