Merged /contrib/alon/BETA21@778

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@782 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/ChangeLog b/ChangeLog
index 269c54170550230ff5a1c3239e2edfdda7e879fb..01b813f08d781779749d6133247b4ffd1eb207c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ $Id$
   claimed that it would support subnets of /30 or less
   but actually would only accept /29 or less.
 * Extend byte counters to 64 bits (M. van Cuijk).
+* PKCS#11 fixes (Alon Bar-Lev).
 * Fixed bug in Linux get_default_gateway function
   introduced in 2.0.4, which would cause redirect-gateway
   on Linux clients to fail.

diff --git a/init.c b/init.c
index 503e75cec04b0f2231aa8f6179522fec79e4d317..ac40dc55ec6f18b81f8b75dfd820376b642a2a4c 100644 (file)
--- a/init.c
+++ b/init.c
@@ -114,7 +114,7 @@ context_init_1 (struct context *c)
 #endif
 
 #if defined(ENABLE_PKCS11)
-  {
+  if (c->first_time) {
     int i;
     pkcs11_initialize (c->options.pkcs11_pin_cache_period);
     for (i=0;i<MAX_PARMS && c->options.pkcs11_providers[i] != NULL;i++)