diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-07-08 22:11:48 -0500 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-11 14:45:06 -0200 |
| commit | 8d058e791482ecd6934e12d34fa45df511d7ef3f (patch) | |
| tree | 0f87c3a4de6fc98bb0a8256e9ca7fe526d9043e9 | |
| parent | 6ca5c3ca6f257db8648e4fafe1443158c915ff8a (diff) | |
| download | pfsense-8d058e791482ecd6934e12d34fa45df511d7ef3f.zip pfsense-8d058e791482ecd6934e12d34fa45df511d7ef3f.tar.gz | |
Exclude non-qualified hostnames from hosts file. Ticket #6064
| -rw-r--r-- | src/etc/inc/system.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index a9a822a..e57fadf 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -352,11 +352,11 @@ function system_hosts_generate() { if ($config['interfaces']['lan']) { $cfgip = get_interface_ip("lan"); if (is_ipaddr($cfgip)) { - $hosts .= "{$cfgip} {$syscfg['hostname']}.{$syscfg['domain']} {$syscfg['hostname']}\n"; + $hosts .= "{$cfgip} {$syscfg['hostname']}.{$syscfg['domain']}\n"; } $cfgipv6 = get_interface_ipv6("lan"); if (is_ipaddrv6($cfgipv6)) { - $hosts .= "{$cfgipv6} {$syscfg['hostname']}.{$syscfg['domain']} {$syscfg['hostname']}\n"; + $hosts .= "{$cfgipv6} {$syscfg['hostname']}.{$syscfg['domain']}\n"; } } else { $sysiflist = get_configured_interface_list(); @@ -365,12 +365,12 @@ function system_hosts_generate() { if (!interface_has_gateway($sysif)) { $cfgip = get_interface_ip($sysif); if (is_ipaddr($cfgip)) { - $hosts .= "{$cfgip} {$syscfg['hostname']}.{$syscfg['domain']} {$syscfg['hostname']}\n"; + $hosts .= "{$cfgip} {$syscfg['hostname']}.{$syscfg['domain']}\n"; $hosts_if_found = true; } $cfgipv6 = get_interface_ipv6($sysif); if (is_ipaddrv6($cfgipv6)) { - $hosts .= "{$cfgipv6} {$syscfg['hostname']}.{$syscfg['domain']} {$syscfg['hostname']}\n"; + $hosts .= "{$cfgipv6} {$syscfg['hostname']}.{$syscfg['domain']}\n"; $hosts_if_found = true; } if ($hosts_if_found == true) { @@ -387,7 +387,7 @@ function system_hosts_generate() { foreach ($dnsmasqcfg['hosts'] as $host) { if ($host['host'] || $host['host'] == "0") { - $lhosts .= "{$host['ip']} {$host['host']}.{$host['domain']} {$host['host']}\n"; + $lhosts .= "{$host['ip']} {$host['host']}.{$host['domain']}\n"; } else { $lhosts .= "{$host['ip']} {$host['domain']}\n"; } @@ -396,7 +396,7 @@ function system_hosts_generate() { } foreach ($host['aliases']['item'] as $alias) { if ($alias['host'] || $alias['host'] == "0") { - $lhosts .= "{$host['ip']} {$alias['host']}.{$alias['domain']} {$alias['host']}\n"; + $lhosts .= "{$host['ip']} {$alias['host']}.{$alias['domain']}\n"; } else { $lhosts .= "{$host['ip']} {$alias['domain']}\n"; } @@ -407,11 +407,11 @@ function system_hosts_generate() { if (is_array($dhcpifconf['staticmap']) && isset($dhcpifconf['enable'])) { foreach ($dhcpifconf['staticmap'] as $host) { if ($host['ipaddr'] && $host['hostname'] && $host['domain']) { - $dhosts .= "{$host['ipaddr']} {$host['hostname']}.{$host['domain']} {$host['hostname']}\n"; + $dhosts .= "{$host['ipaddr']} {$host['hostname']}.{$host['domain']}\n"; } else if ($host['ipaddr'] && $host['hostname'] && $dhcpifconf['domain']) { - $dhosts .= "{$host['ipaddr']} {$host['hostname']}.{$dhcpifconf['domain']} {$host['hostname']}\n"; + $dhosts .= "{$host['ipaddr']} {$host['hostname']}.{$dhcpifconf['domain']}\n"; } else if ($host['ipaddr'] && $host['hostname']) { - $dhosts .= "{$host['ipaddr']} {$host['hostname']}.{$syscfg['domain']} {$host['hostname']}\n"; + $dhosts .= "{$host['ipaddr']} {$host['hostname']}.{$syscfg['domain']}\n"; } } } @@ -429,11 +429,11 @@ function system_hosts_generate() { $ipaddrv6 = merge_ipv6_delegated_prefix(get_interface_ipv6($dhcpif), $ipaddrv6, 64); } if ($host['domain']) { - $dhosts .= "{$ipaddrv6} {$host['hostname']}.{$host['domain']} {$host['hostname']}\n"; + $dhosts .= "{$ipaddrv6} {$host['hostname']}.{$host['domain']}\n"; } else if ($dhcpifconf['domain']) { - $dhosts .= "{$ipaddrv6} {$host['hostname']}.{$dhcpifconf['domain']} {$host['hostname']}\n"; + $dhosts .= "{$ipaddrv6} {$host['hostname']}.{$dhcpifconf['domain']}\n"; } else { - $dhosts .= "{$ipaddrv6} {$host['hostname']}.{$syscfg['domain']} {$host['hostname']}\n"; + $dhosts .= "{$ipaddrv6} {$host['hostname']}.{$syscfg['domain']}\n"; } } } |
