aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2012-08-09 14:36:30 -0400
committerjim-p <jimp@pfsense.org>2012-08-09 14:36:30 -0400
commit2d36fd3c18d7a01e86f5c009f85513ade6c38d4e (patch)
treed8ff605fa1577a0e954603372d5ea804a376e1af
parentd28d34d331facac570a505cef5eed927530155d9 (diff)
downloadpfsense-packages-2d36fd3c18d7a01e86f5c009f85513ade6c38d4e.tar.gz
pfsense-packages-2d36fd3c18d7a01e86f5c009f85513ade6c38d4e.tar.bz2
pfsense-packages-2d36fd3c18d7a01e86f5c009f85513ade6c38d4e.zip
Fix inline client export
-rwxr-xr-xconfig/openvpn-client-export/openvpn-client-export.inc2
-rwxr-xr-xconfig/openvpn-client-export/openvpn-client-export.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 5 insertions, 3 deletions
diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc
index 9f05e10f..271ea83a 100755
--- a/config/openvpn-client-export/openvpn-client-export.inc
+++ b/config/openvpn-client-export/openvpn-client-export.inc
@@ -340,6 +340,8 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $usetoke
if ($settings['tls']) {
$conf .= "<tls-auth>{$nl}" . base64_decode($settings['tls']) . "</tls-auth>{$nl} key-direction 1{$nl}";
}
+ return $conf;
+ break;
case "yealink_t28":
case "yealink_t38g":
// create template directory
diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml
index 605bc190..966348d4 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.20</version>
+ <version>0.21</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 da8430ce..5794bbf3 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1336,7 +1336,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.20</version>
+ <version>0.21</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 344f6c7d..d9bc5e2d 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1323,7 +1323,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.20</version>
+ <version>0.21</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>