diff options
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.xml | 2 | ||||
| -rwxr-xr-x | config/openvpn-client-export/vpn_openvpn_export.php | 10 | ||||
| -rwxr-xr-x | pkg_config.8.xml | 2 | ||||
| -rwxr-xr-x | pkg_config.8.xml.amd64 | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml index 2e9e96da..d06d50f8 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>0.7</version> + <version>0.8</version> <title>OpenVPN Client Export</title> <include_file>/usr/local/pkg/openvpn-client-export.inc</include_file> <backup_file></backup_file> diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php index 837b854b..6bfdd4e3 100755 --- a/config/openvpn-client-export/vpn_openvpn_export.php +++ b/config/openvpn-client-export/vpn_openvpn_export.php @@ -78,7 +78,7 @@ foreach($a_server as $sindex => $server) { $ras_user[] = $ras_userent; } } - } elseif (!empty($server['authmode']) && ($server['mode'] != "server_user")) { + } elseif ((!empty($server['authmode']) && ($server['mode'] != "server_user")) || ($server['mode'] == "server_tls")) { foreach($a_cert as $cindex => $cert) { if ($cert['caref'] != $server['caref']) continue; @@ -512,7 +512,11 @@ function server_changed() { var cell1 = row.insertCell(1); var cell2 = row.insertCell(2); cell0.className = "listlr"; - cell0.innerHTML = "External Auth+Cert"; + if (servers[index][2] == "server_tls") { + cell0.innerHTML = "Certificate (SSL/TLS, no Auth)"; + } else { + cell0.innerHTML = "Certificate with External Auth"; + } cell1.className = "listr"; cell1.innerHTML = certs[j][1]; cell2.className = "listr"; @@ -530,7 +534,7 @@ function server_changed() { var cell1 = row.insertCell(1); var cell2 = row.insertCell(2); cell0.className = "listlr"; - cell0.innerHTML = "External authentication users"; + cell0.innerHTML = "Authentication Only (No Cert)"; cell1.className = "listr"; cell1.innerHTML = "none"; cell2.className = "listr"; diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 639040d2..59c1e628 100755 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -856,7 +856,7 @@ <depends_on_package>zip-3.0.tbz</depends_on_package> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>0.7</version> + <version>0.8</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 cce30c53..5c8af9b7 100755 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -863,7 +863,7 @@ <depends_on_package>zip-3.0.tbz</depends_on_package> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>0.7</version> + <version>0.8</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> |