diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-01-30 04:06:00 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-01-30 04:06:00 -0600 |
| commit | ec0643f7f1537ab6a18ed05fc015ecba598fcffc (patch) | |
| tree | 178b2cc488d91f763dd4e31558bdb6d5a16839b1 /usr/local | |
| parent | 5559b4a97e46a71878c8c1cc23c5d628aa611068 (diff) | |
| parent | 0faf3300669dd9d70a78b2636874f87c78f48a47 (diff) | |
| download | pfsense-ec0643f7f1537ab6a18ed05fc015ecba598fcffc.zip pfsense-ec0643f7f1537ab6a18ed05fc015ecba598fcffc.tar.gz | |
Merge pull request #2575 from davidjwood/RELENG_2_2-ppp-ipv6-new
Diffstat (limited to 'usr/local')
| -rwxr-xr-x | usr/local/sbin/ppp-ipv6 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr/local/sbin/ppp-ipv6 b/usr/local/sbin/ppp-ipv6 index a05a4c2..b7bb9f2 100755 --- a/usr/local/sbin/ppp-ipv6 +++ b/usr/local/sbin/ppp-ipv6 @@ -25,6 +25,10 @@ function interface_ipv6_lower($interface_real) { switch ($ifcfg['ipaddrv6']) { case 'slaac': case 'dhcp6': + // Take no action if dhcp6 is active on the parent interface, not the PPP interface + if ($ifcfg['ipaddrv6']==='dhcp6' && !(isset($ifcfg['dhcp6usev4iface']) || $ifcfg['ipaddr']==='ppp')) { + break; + } // bring down dhcp6c if it is running $pidv6 = find_dhcp6c_process($interface_real); if ($pidv6) { @@ -65,6 +69,10 @@ function interface_ipv6_raise($interface_real) { switch ($ifcfg['ipaddrv6']) { case 'slaac': case 'dhcp6': + // Take no action if dhcp6 is active on the parent interface, not the PPP interface + if ($ifcfg['ipaddrv6']==='dhcp6' && !(isset($ifcfg['dhcp6usev4iface']) || $ifcfg['ipaddr']==='ppp')) { + break; + } $pidv6 = find_dhcp6c_process($interface_real); if (empty($pidv6)) { // only fire if router advertisements off |
