aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim P <jim@pingle.org>2013-01-27 12:05:32 -0800
committerJim P <jim@pingle.org>2013-01-27 12:05:32 -0800
commit5237f88d265add14defab58435192cf71d1c0d81 (patch)
tree9e9270816ad0ec8b72a9613251902ff125877cad
parentcaaa718952fbb8c990049212a6d03c1f4a9f1136 (diff)
parent1f23382b5e88deb57af71a4c72ec514f9f8f93e2 (diff)
downloadpfsense-packages-5237f88d265add14defab58435192cf71d1c0d81.tar.gz
pfsense-packages-5237f88d265add14defab58435192cf71d1c0d81.tar.bz2
pfsense-packages-5237f88d265add14defab58435192cf71d1c0d81.zip
Merge pull request #365 from bcyrill/shared_export
Do not mix OpenVPN's secure modes
-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 9e23d3ca..d79c42c3 100755
--- a/config/openvpn-client-export/openvpn-client-export.inc
+++ b/config/openvpn-client-export/openvpn-client-export.inc
@@ -725,7 +725,7 @@ function openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, $zipco
$conf .= "persist-key\n";
$conf .= "proto {$proto}\n";
$conf .= "cipher {$cipher}\n";
- $conf .= "client\n";
+ $conf .= "pull\n";
$conf .= "resolv-retry infinite\n";
$conf .= "remote {$server_host} {$server_port}\n";
if ($settings['local_network']) {
diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml
index e71fa7ca..11659251 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.0.1</version>
+ <version>1.0.2</version>
<title>OpenVPN Client Export</title>
<include_file>/usr/local/pkg/openvpn-client-export.inc</include_file>
<backup_file></backup_file>