aboutsummaryrefslogtreecommitdiffstats
path: root/config/openvpn-client-export
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-11-12 08:20:53 -0500
committerjim-p <jimp@pfsense.org>2013-11-12 08:20:53 -0500
commit9231e71d85b2cd95419b40ff21b80613d09be913 (patch)
treef2f96c75789c3d0d5ef7df46e3f41f261c539aa6 /config/openvpn-client-export
parentc0380c8b336b1c7709d2116bbb4c5a448c1f9c9e (diff)
downloadpfsense-packages-9231e71d85b2cd95419b40ff21b80613d09be913.tar.gz
pfsense-packages-9231e71d85b2cd95419b40ff21b80613d09be913.tar.bz2
pfsense-packages-9231e71d85b2cd95419b40ff21b80613d09be913.zip
Don't include a pkcs12 line in the Viscosity config, it uses individual ca/cert/key lines and not pkcs12.
Diffstat (limited to 'config/openvpn-client-export')
-rwxr-xr-xconfig/openvpn-client-export/openvpn-client-export.inc2
-rwxr-xr-xconfig/openvpn-client-export/openvpn-client-export.xml2
2 files changed, 2 insertions, 2 deletions
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);
diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml
index f00ff084..9a59ab27 100755
--- a/config/openvpn-client-export/openvpn-client-export.xml
+++ b/config/openvpn-client-export/openvpn-client-export.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<packagegui>
<name>OpenVPN Client Export</name>
- <version>1.1.4</version>
+ <version>1.1.5</version>
<title>OpenVPN Client Export</title>
<include_file>/usr/local/pkg/openvpn-client-export.inc</include_file>
<backup_file></backup_file>