Correct a bug in the OpenVPN client export package. The config directory

path must exist. If it is not included in the template archive, create it.
I didn't notice this bug before as the template archive contained the
config import directory so it was copied along with other template data.
Without this fix, errors would be thrown but the output would be included
in the download which appended them to the beginning of the executable.
This of course corrupted the file contents. Reported by Chris Buechler.

1 files changed, 7 insertions, 2 deletions

diff --git a/packages/openvpn-client-export/openvpn-client-export.inc b/packages/openvpn-client-export/openvpn-client-export.inc
index 0a386e31..b2286ef2 100755
--- a/packages/openvpn-client-export/openvpn-client-export.inc
+++ b/packages/openvpn-client-export/openvpn-client-export.inc
@@ -188,16 +188,21 @@ function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $uset
 	if (!$cert)
 		return false;
 
-	// create temp config directory
+	// create template directory
 	$tempdir = $g['tmp_path']."/openvpn-export-".uniqid();
 	mkdir($tempdir, 0700, true);
 
+	// create config directory
+	$confdir = "{$tempdir}/config";
+	if (!is_dir($conf_dir))
+		mkdir($confdir, 0700, true);
+
 	// copy the template directory
 	exec("cp -r {$workdir}/template/* {$tempdir}");
 
 	// write cofiguration file
 	$prefix = openvpn_client_export_prefix($srvid);
-	$cfgfile = "{$tempdir}/config/{$prefix}-config.ovpn";
+	$cfgfile = "{$confdir}/{$prefix}-config.ovpn";
 	$conf = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $usetoken);
 	if (!$conf)
 		return false;