From 14dfb79ca65dd80e117103c4f8852ae2b4a419a0 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Sun, 30 Jan 2011 08:26:23 -0600 Subject: Configuration tests. --- module/p11-kit-lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/p11-kit-lib.c') 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; -- cgit v1.2.3