summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-08-03 11:37:40 +0200
committerStef Walter <stefw@collabora.co.uk>2011-08-03 11:37:40 +0200
commit0a2fd044770d645b7707d2b4926a3214147973a8 (patch)
treeed59ea7842f69d7bd81cca4f5d8b0a4716c14f10
parent3b78f626872c637339a3302b8f0607c778aef92c (diff)
Don't fail when duplicate modules are configured.
* Duplicate modules may be caused by editor backups, misconfigurations or a multitude of other sources. Failing dead is a bit harsh. * After discussing gnutls needs with Nikos
-rw-r--r--p11-kit/modules.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/p11-kit/modules.c b/p11-kit/modules.c
index f068510..9771e6b 100644
--- a/p11-kit/modules.c
+++ b/p11-kit/modules.c
@@ -361,7 +361,7 @@ take_config_and_load_module_unlocked (char **name, hashmap **config)
if (prev) {
_p11_message ("duplicate configured module: %s: %s", mod->name, path);
free_module_unlocked (mod);
- return CKR_GENERAL_ERROR;
+ return CKR_OK;
}
/*