static State global = { { { { -1, -1 }, NULL, }, }, NULL, NULL, FIRST_HANDLE, NULL };
#define PROXY_VALID(px) ((px) && (px)->forkid == p11_forkid)
+#define PROXY_FORKED(px) ((px) && (px)->forkid != p11_forkid)
#define MANUFACTURER_ID "PKCS#11 Kit "
#define LIBRARY_DESCRIPTION "PKCS#11 Kit Proxy Module "
}
static void
-proxy_free (Proxy *py)
+proxy_free (Proxy *py, unsigned finalize)
{
if (py) {
- p11_kit_modules_finalize (py->inited);
+ if (finalize)
+ p11_kit_modules_finalize (py->inited);
free (py->inited);
p11_dict_free (py->sessions);
free (py->mappings);
p11_unlock ();
- proxy_free (py);
+ proxy_free (py, 1);
}
p11_debug ("out: %lu", rv);
}
if (rv != CKR_OK) {
- proxy_free (py);
+ proxy_free (py, 1);
return rv;
}
p11_lock ();
if (!PROXY_VALID (state->px)) {
+ unsigned call_finalize = 1;
+
initialize = true;
- proxy_free (state->px);
+ if (PROXY_FORKED(state->px))
+ call_finalize = 0;
+ proxy_free (state->px, call_finalize);
+
state->px = NULL;
} else {
state->px->refs++;
p11_unlock ();
- proxy_free (py);
+ proxy_free (py, 1);
p11_debug ("out: 0");
return rv;
}