From 6e56e6c73740fe51f80b48a98d406adfe2b577f0 Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 27 Apr 2010 17:19:58 -0400 Subject: Fix zipped config export for the LDAP/RADIUS case. --- config/openvpn-client-export/openvpn-client-export.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'config/openvpn-client-export/openvpn-client-export.inc') 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; } -- cgit v1.2.3