diff options
| author | jim-p <jimp@pfsense.org> | 2017-04-03 14:52:03 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-04-03 14:52:03 -0400 |
| commit | b3a5af718b556c90737059bd964b630673387b71 (patch) | |
| tree | 326a801320bcb976b7690607f18dcb806c89dbee /src/etc | |
| parent | d76ac3ab3ae4a0172401e9fb457e454c6780638a (diff) | |
| parent | 6ff1f0f39f772173162cc7797ea86110e193913e (diff) | |
| download | pfsense-b3a5af718b556c90737059bd964b630673387b71.zip pfsense-b3a5af718b556c90737059bd964b630673387b71.tar.gz | |
Merge pull request #3636 from luckman212/ipv6-etc-hosts-fix-1
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/system.inc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 61b6a77..6a1f529 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -327,13 +327,15 @@ function system_hosts_local_entries() { ); $hosts_if_found = true; } - $cfgipv6 = get_interface_ipv6($sysif); - if (is_ipaddrv6($cfgipv6)) { - $hosts[] = array( - 'ipaddr' => $cfgipv6, - 'fqdn' => $local_fqdn - ); - $hosts_if_found = true; + if (!isset($syscfg['ipv6dontcreatelocaldns'])) { + $cfgipv6 = get_interface_ipv6($sysif); + if (is_ipaddrv6($cfgipv6)) { + $hosts[] = array( + 'ipaddr' => $cfgipv6, + 'fqdn' => $local_fqdn + ); + $hosts_if_found = true; + } } if ($hosts_if_found == true) { break; |
