From b34738ed08c2227300d554b139e2495ca5da97d6 Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@corsac.net>
Date: Thu, 28 Jun 2012 21:16:07 +0200
Subject: Imported Upstream version 4.6.4
---
src/libstrongswan/plugins/pkcs11/pkcs11_manager.c | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
(limited to 'src/libstrongswan/plugins/pkcs11/pkcs11_manager.c')
diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
index 431cd6a2c..5b321b26e 100644
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
@@ -323,17 +323,11 @@ METHOD(pkcs11_manager_t, create_token_enumerator, enumerator_t*,
return &enumerator->public;
}
-/**
- * Singleton instance
- */
-static private_pkcs11_manager_t *singleton = NULL;
-
METHOD(pkcs11_manager_t, destroy, void,
private_pkcs11_manager_t *this)
{
this->libs->destroy_function(this->libs, (void*)lib_entry_destroy);
free(this);
- singleton = NULL;
}
/**
@@ -386,14 +380,12 @@ pkcs11_manager_t *pkcs11_manager_create(pkcs11_manager_token_event_t cb,
}
enumerator->destroy(enumerator);
- singleton = this;
-
enumerator = this->libs->create_enumerator(this->libs);
while (enumerator->enumerate(enumerator, &entry))
{
query_slots(entry);
- entry->job = callback_job_create((void*)dispatch_slot_events,
- entry, (void*)end_dispatch, NULL);
+ entry->job = callback_job_create_with_prio((void*)dispatch_slot_events,
+ entry, (void*)end_dispatch, NULL, JOB_PRIO_CRITICAL);
lib->processor->queue_job(lib->processor, (job_t*)entry->job);
}
enumerator->destroy(enumerator);
@@ -401,10 +393,3 @@ pkcs11_manager_t *pkcs11_manager_create(pkcs11_manager_token_event_t cb,
return &this->public;
}
-/**
- * See header
- */
-pkcs11_manager_t *pkcs11_manager_get()
-{
- return (pkcs11_manager_t*)singleton;
-}
--
cgit v1.2.3