From 9231e71d85b2cd95419b40ff21b80613d09be913 Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 12 Nov 2013 08:20:53 -0500 Subject: Don't include a pkcs12 line in the Viscosity config, it uses individual ca/cert/key lines and not pkcs12. --- config/openvpn-client-export/openvpn-client-export.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/openvpn-client-export/openvpn-client-export.inc') diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index cf7eb7a4..4c283410 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -618,7 +618,7 @@ function viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $usead // We need to nuke the ca line from the above config if it exists. $conf = explode("\n", $conf); for ($i=0; $i < count($conf); $i++) { - if (substr($conf[$i], 0, 3) == "ca ") + if ((substr($conf[$i], 0, 3) == "ca ") || (substr($conf[$i], 0, 7) == "pkcs12 ")) unset($conf[$i]); } $conf = implode("\n", $conf); -- cgit v1.2.3