diff options
| author | Ermal <eri@pfsense.org> | 2013-08-16 10:42:05 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-08-16 10:42:05 +0000 |
| commit | 329acfb2fe275d392934f76c08d65ba11207506e (patch) | |
| tree | e4c89b0683d9f74f8851838c409ab76f988709ed | |
| parent | 93d38614553352afa2bfc2bdf737a85189e24299 (diff) | |
| download | pfsense-329acfb2fe275d392934f76c08d65ba11207506e.zip pfsense-329acfb2fe275d392934f76c08d65ba11207506e.tar.gz | |
Reduce diff with master
| -rw-r--r-- | etc/inc/interfaces.inc | 2 | ||||
| -rw-r--r-- | etc/inc/services.inc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 55731a8..88c17a7 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -3137,6 +3137,8 @@ function interface_track6_configure($interface = "lan", $wancfg) { $linklocal = find_interface_ipv6_ll($realif); if (!empty($linklocal)) mwexec("/sbin/ifconfig {$realif} inet6 {$linklocal} delete"); + /* XXX: This might break for good on a carp installation using link-local as network ips */ + /* XXX: Probably should remove? */ mwexec("/sbin/ifconfig {$realif} inet6 fe80::1:1%{$realif}"); $trackcfg = $config['interfaces'][$wancfg['track6-interface']]; diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 5938dc4..5119a39 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -1660,9 +1660,9 @@ function services_dnsmasq_configure() { $laddr6 = find_interface_ipv6($if); if (is_ipaddrv6($laddr6) && !isset($config['dnsmasq']['strictbind'])) { /* - * XXX: Since dnsmasq does not support link-local address - * with scope specified. These checks are being done. - */ + * XXX: Since dnsmasq does not support link-local address + * with scope specified. These checks are being done. + */ if (is_linklocal($laddr6) && strstr($laddr6, "%")) { $tmpaddrll6 = explode("%", $laddr6); $listen_addresses .= " --listen-address={$tmpaddrll6[0]} "; |
