Brought up-to-date with Alon's PKCS11 patch at

https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21/openvpn@652
Pre-2.1_beta5


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

1 files changed, 10 insertions, 10 deletions

diff --git a/pkcs11.c b/pkcs11.c
index 54dc532..8dd9dfe 100644
--- a/pkcs11.c
+++ b/pkcs11.c
@@ -1465,18 +1465,18 @@ static
 CK_RV
 pkcs11_forkFixup () {
 
-	pkcs11_provider_t current;
+	if (pkcs11_data != NULL && pkcs11_data->fInitialized) {
 
-	ASSERT (pkcs11_data!=NULL);
-	ASSERT (pkcs11_data->fInitialized);
+		pkcs11_provider_t current;
 
-	for (
-		current = pkcs11_data->providers;
-		current != NULL;
-		current = current->next
-	) {
-		if (current->fEnabled) {
-			current->f->C_Initialize (NULL);
+		for (
+			current = pkcs11_data->providers;
+			current != NULL;
+			current = current->next
+		) {
+			if (current->fEnabled) {
+				current->f->C_Initialize (NULL);
+			}
 		}
 	}