diff options
| author | jim-p <jimp@pfsense.org> | 2012-04-04 16:10:44 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-04-04 16:47:32 -0400 |
| commit | b5d8b863147cff56adf481200ca04fea0b89fbc6 (patch) | |
| tree | 6d9d2676615b0513cc9502ef711ba5866a9acb02 | |
| parent | 2a5327ac65a3cdf08c47df669b8c39ca6369a93e (diff) | |
| download | pfsense-packages-b5d8b863147cff56adf481200ca04fea0b89fbc6.tar.gz pfsense-packages-b5d8b863147cff56adf481200ca04fea0b89fbc6.tar.bz2 pfsense-packages-b5d8b863147cff56adf481200ca04fea0b89fbc6.zip | |
Handle a blank hostname a bit more gracefully when exporting OpenVPN.
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.inc | 8 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index b9ac8866..22f31a21 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -71,7 +71,7 @@ function openvpn_client_export_prefix($srvid) { if ($settings['disable']) return false; - $host = $config['system']['hostname']; + $host = empty($config['system']['hostname']) ? "openvpn" : $config['system']['hostname']; $prot = ($settings['protocol'] == 'UDP' ? 'udp' : $settings['protocol']); $port = $settings['local_port']; @@ -161,7 +161,8 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $usetoke $server_host = get_interface_ip($interface); } } else if ($useaddr == "serverhostname" || empty($useaddr)) { - $server_host = "{$config['system']['hostname']}.{$config['system']['domain']}"; + $server_host = empty($config['system']['hostname']) "" : "{$config['system']['hostname']}."; + $server_host .= "{{$config['system']['domain']}"; } else $server_host = $useaddr; @@ -600,7 +601,8 @@ function openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, $zipco $server_host = get_interface_ip($interface); } } else if ($useaddr == "serverhostname" || empty($useaddr)) { - $server_host = "{$config['system']['hostname']}.{$config['system']['domain']}"; + $server_host = empty($config['system']['hostname']) "" : "{$config['system']['hostname']}."; + $server_host .= "{{$config['system']['domain']}"; } else $server_host = $useaddr; diff --git a/pkg_config.8.xml b/pkg_config.8.xml index d7d007c1..b996fc5f 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1195,7 +1195,7 @@ </depends_on_package_pbi> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>0.9.7</version> + <version>0.9.8</version> <status>BETA</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 22f4aba6..b1d4a4a0 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1153,7 +1153,7 @@ <depends_on_package>zip-3.0.tbz</depends_on_package> <build_port_path>/usr/ports/archivers/p7zip</build_port_path> <build_port_path>/usr/ports/archivers/zip</build_port_path> - <version>0.9.7</version> + <version>0.9.8</version> <status>BETA</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file> |