diff options
author | Andreas Metzler <ametzler@bebt.de> | 2016-02-23 19:12:40 +0100 |
---|---|---|
committer | Stef Walter <stefw@redhat.com> | 2016-02-24 15:20:29 +0100 |
commit | 77d0791d0d6baf6fcc7578e0d170d754850c4068 (patch) | |
tree | aae2ccb46e8a6b1b528144f0ab16e18463032064 /p11-kit/modules.c | |
parent | 6c4ef3f492d88acca931174519b7aa1215cc1a18 (diff) | |
download | p11-kit-77d0791d0d6baf6fcc7578e0d170d754850c4068.tar.gz |
Doc: p11_kit_module_load accepts a filename arg.
p11_kit_module_load() hands on the module_path argument to
load_module_from_file_inlock() which accepts relative paths, prepending
P11_MODULE_PATH. Update API documentation accordingly.
https://lists.freedesktop.org/archives/p11-glue/2016-February/000587.html
Diffstat (limited to 'p11-kit/modules.c')
-rw-r--r-- | p11-kit/modules.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/p11-kit/modules.c b/p11-kit/modules.c index 63baeb1..c1094ce 100644 --- a/p11-kit/modules.c +++ b/p11-kit/modules.c @@ -2353,13 +2353,16 @@ p11_module_load_inlock_reentrant (CK_FUNCTION_LIST *module, /** * p11_kit_module_load: - * @module_path: full file path of module library + * @module_path: relative or full file path of module library * @flags: flags to use when loading the module * * Load an arbitrary PKCS\#11 module from a dynamic library file, and * initialize it. Normally using the p11_kit_modules_load() function * is preferred. * + * A full file path or just (path/)filename relative to + * P11_MODULE_PATH are accepted. + * * Using this function to load modules allows coordination between multiple * callers of the same module in a single process. If @flags contains the * %P11_KIT_MODULE_UNMANAGED flag, then the modules will be not be loaded |