diff options
| author | jim-p <jim@pingle.org> | 2010-04-27 17:19:58 -0400 |
|---|---|---|
| committer | jim-p <jim@pingle.org> | 2010-04-27 17:20:50 -0400 |
| commit | 6e56e6c73740fe51f80b48a98d406adfe2b577f0 (patch) | |
| tree | 107643f1f28c15e09c0d62eb503ed107a7a3c9c1 | |
| parent | 6b993bd567ab9d8bcec348fcabb73ef2b9439235 (diff) | |
| download | pfsense-packages-6e56e6c73740fe51f80b48a98d406adfe2b577f0.tar.gz pfsense-packages-6e56e6c73740fe51f80b48a98d406adfe2b577f0.tar.bz2 pfsense-packages-6e56e6c73740fe51f80b48a98d406adfe2b577f0.zip | |
Fix zipped config export for the LDAP/RADIUS case.
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index eae9f713..ca72798d 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -232,12 +232,12 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $usetoke else openvpn_client_pem_to_pk12($p12file, $outpass, $crtfile, $keyfile, $cafile); - exec("cd {$tempdir}/.. && /usr/local/bin/zip -r {$g['tmp_path']}/{$prefix}-config.zip {$prefix}"); - - // Remove temporary directory - exec("rm -rf {$tempdir}"); - return "{$prefix}-config.zip"; } + exec("cd {$tempdir}/.. && /usr/local/bin/zip -r {$g['tmp_path']}/{$prefix}-config.zip {$prefix}"); + + // Remove temporary directory + exec("rm -rf {$tempdir}"); + return "{$prefix}-config.zip"; } else return $conf; } |