aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-11-05 07:48:05 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-11-05 07:48:05 +0000
commit06d92b294128984d824c12cfb24256d62f68589c (patch)
tree0687ccfd7a701588e0ebb27bb1c946f76da89888
parentsvn merge -r 771:780 $SO/trunk/openvpn (diff)
downloadopenvpn-06d92b294128984d824c12cfb24256d62f68589c.tar.xz
Merged /contrib/alon/BETA21@778
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@782 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--ChangeLog1
-rw-r--r--init.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 269c541..01b813f 100644
--- 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 503e75c..ac40dc5 100644
--- 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++)