diff options
| author | Jim P <jim@pingle.org> | 2012-10-03 05:16:08 -0700 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2012-10-03 05:16:08 -0700 |
| commit | 02b3cbc15fd82b96d04408e1b95e6439fc51e6cf (patch) | |
| tree | 4c38af22b31fc10360e7c9bb08591ded6db61587 /config | |
| parent | 98c70f62f1b160064b772ead740d52e48fc36164 (diff) | |
| parent | 720d50b07c40e0f8ad418cc4dc78537f38fa21ec (diff) | |
| download | pfsense-packages-02b3cbc15fd82b96d04408e1b95e6439fc51e6cf.tar.gz pfsense-packages-02b3cbc15fd82b96d04408e1b95e6439fc51e6cf.tar.bz2 pfsense-packages-02b3cbc15fd82b96d04408e1b95e6439fc51e6cf.zip | |
Merge pull request #328 from phil-davis/master
Write client install exe to temp dir
Diffstat (limited to 'config')
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.inc | 8 |
1 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 a96c6638..026efabb 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -3,7 +3,7 @@ openvpn-client-export.inc Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com> Copyright (C) 2008 Shrew Soft Inc - Copyright (C) 2010 Ermal Lu�i + Copyright (C) 2010 Ermal Luci All rights reserved. Parts of this code was originally based on vpn_ipsec_sad.php @@ -431,8 +431,6 @@ function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $quot if (!file_exists($workdir . "/template/{$client_install_exe}")) openvpn_client_export_install(); - exec("/bin/cp {$workdir}/template/{$client_install_exe} {$workdir}/template/openvpn-install.exe"); - $validconfig = openvpn_client_export_validate_config($srvid, $usrid, $crtid); if ($validconfig) { list($settings, $server_cert, $server_ca, $servercn, $user, $cert, $nokeys) = $validconfig; @@ -451,8 +449,10 @@ function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $quot // copy the template directory exec("cp -r {$workdir}/template/* {$tempdir}"); + // and put the required installer exe in place + exec("/bin/cp {$tempdir}/{$client_install_exe} {$tempdir}/openvpn-install.exe"); - // write cofiguration file + // write configuration file $prefix = openvpn_client_export_prefix($srvid); $cfgfile = "{$confdir}/{$prefix}-config.ovpn"; if (!empty($proxy) && $proxy['proxy_authtype'] != "none") { |