diff options
| author | jim-p <jimp@pfsense.org> | 2013-01-07 12:19:58 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-01-07 12:20:49 -0500 |
| commit | 44b86ff3adbd39ff65c3eb5637acfbfd716fd0e4 (patch) | |
| tree | 8436899d0c4ce5e98d9959dac862824a58059d87 | |
| parent | 0d92e8fdabb102e43afb99f848fa992557fb37e1 (diff) | |
| download | pfsense-packages-44b86ff3adbd39ff65c3eb5637acfbfd716fd0e4.tar.gz pfsense-packages-44b86ff3adbd39ff65c3eb5637acfbfd716fd0e4.tar.bz2 pfsense-packages-44b86ff3adbd39ff65c3eb5637acfbfd716fd0e4.zip | |
Don't offer a server certificate to export. It doesn't work, and can just lead to confusion.
| -rwxr-xr-x | config/openvpn-client-export/vpn_openvpn_export.php | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php index 85d44177..d50b5ec8 100755 --- a/config/openvpn-client-export/vpn_openvpn_export.php +++ b/config/openvpn-client-export/vpn_openvpn_export.php @@ -80,7 +80,7 @@ foreach($a_server as $sindex => $server) { } } elseif (($server['mode'] == "server_tls") || (($server['mode'] == "server_tls_user") && ($server['authmode'] != "Local Database"))) { foreach($a_cert as $cindex => $cert) { - if ($cert['caref'] != $server['caref']) + if (($cert['caref'] != $server['caref']) || ($cert['refid'] == $server['certref'])) continue; $ras_cert_entry['cindex'] = $cindex; $ras_cert_entry['certname'] = $cert['descr']; diff --git a/pkg_config.8.xml b/pkg_config.8.xml index c6e18d0e..f85ba87a 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1391,7 +1391,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>0.26</version> + <version>0.27</version> <status>BETA</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 65b58a1f..a4f6571f 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1378,7 +1378,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>0.26</version> + <version>0.27</version> <status>BETA</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> |