From 5bb3bd5007f0c9b14b077e85b686aa7950d27963 Mon Sep 17 00:00:00 2001 From: jim-p Date: Sun, 14 Jul 2013 14:20:06 -0400 Subject: Replace spaces in a CN with _ in filenames when exporting an OpenVPN client. Also only use a CN if there isn't a username to use instead. Unbreaks Windows Installer export with spaces in CN. --- config/openvpn-client-export/openvpn-client-export.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b2c240ec..ac006d20 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -78,8 +78,8 @@ function openvpn_client_export_prefix($srvid, $usrid = null, $crtid = null) { $filename_addition = ""; if ($usrid && is_numeric($usrid)) $filename_addition = "-".$config['system']['user'][$usrid]['name']; - if ($crtid && is_numeric($crtid) && function_exists("cert_get_cn")) - $filename_addition = "-".cert_get_cn($config['cert'][$crtid]['crt']); + elseif ($crtid && is_numeric($crtid) && function_exists("cert_get_cn")) + $filename_addition = "-" . str_replace(' ', '_', cert_get_cn($config['cert'][$crtid]['crt'])); return "{$host}-{$prot}-{$port}{$filename_addition}"; } -- cgit v1.2.3