diff options
| author | jim-p <jimp@pfsense.org> | 2013-11-12 08:20:53 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-11-12 08:20:53 -0500 |
| commit | 9231e71d85b2cd95419b40ff21b80613d09be913 (patch) | |
| tree | f2f96c75789c3d0d5ef7df46e3f41f261c539aa6 | |
| parent | c0380c8b336b1c7709d2116bbb4c5a448c1f9c9e (diff) | |
| download | pfsense-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.
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.inc | 2 | ||||
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 4 insertions, 4 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> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 96964032..e5ff9281 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1463,7 +1463,7 @@ <depends_on_package_pbi>zip-3.0-i386.pbi p7zip-9.20.1-i386.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>1.1.4</version> + <version>1.1.5</version> <status>RELEASE</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 76dd37d9..a66f3d1c 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1450,7 +1450,7 @@ <depends_on_package_pbi>p7zip-9.20.1-amd64.pbi zip-3.0-amd64.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>1.1.4</version> + <version>1.1.5</version> <status>RELEASE</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> |