summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-09-08 09:21:51 +0200
committerdoktornotor <notordoktor@gmail.com>2015-09-08 09:21:51 +0200
commit35116db6b0d328454d1eee1a311328a996223175 (patch)
tree5d7cf5a2965398cf8206d05f98d4f8810c4ff097
parent64c50ecd239a61b42e9179be486f3792c03cb0b8 (diff)
downloadpfsense-35116db6b0d328454d1eee1a311328a996223175.zip
pfsense-35116db6b0d328454d1eee1a311328a996223175.tar.gz
Fix identification of IPv6 interface with PPP-type ifaces and DHCP6 (2.2.x)
For RELENG_2_2 - same thing as #1886 This has been broken ever since commited in 420aa48 As noted on https://redmine.pfsense.org/issues/3670 - the get_interface_ipv6() function in /etc/inc/interfaces.php incorrectly identifies the interface as the physical hardware interface. As a result, no global IPv6 address can be found (empty $ifcfgipv6) - https://redmine.pfsense.org/issues/3556
-rw-r--r--etc/inc/interfaces.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 2e5438c..b425434 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -4863,7 +4863,7 @@ function get_interface_ipv6($interface = "wan", $flush = false) {
case 'pptp':
case 'ppp':
if ($config['interfaces'][$interface]['ipaddrv6'] == 'dhcp6')
- $realif = get_real_interface($interface, "inet6", true);
+ $realif = get_real_interface($interface, "inet6", false);
break;
}
}
OpenPOWER on IntegriCloud