diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-18 10:48:31 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-18 10:48:31 -0200 |
| commit | 8f928dc3fa1012f1c6d083e9ea336e51807e9d00 (patch) | |
| tree | 36e296d56d1784b0b2dbc3450ef18a113b399f1a /src/usr/local/www/services_dhcpv6.php | |
| parent | 4860277428bd3af0bbb53ac4d2be2de5a924c22e (diff) | |
| download | pfsense-8f928dc3fa1012f1c6d083e9ea336e51807e9d00.zip pfsense-8f928dc3fa1012f1c6d083e9ea336e51807e9d00.tar.gz | |
Simplify logic
Diffstat (limited to 'src/usr/local/www/services_dhcpv6.php')
| -rw-r--r-- | src/usr/local/www/services_dhcpv6.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index afd294d..ea0c6c5 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -481,10 +481,12 @@ $i = 0; foreach ($iflist as $ifent => $ifname) { $oc = $config['interfaces'][$ifent]; + $valid_if_ipaddrv6 = (bool) (is_ipaddrv6($oc['ipaddrv6']) && + !is_linklocal($oc['ipaddrv6'])); - - if ((is_array($config['dhcpdv6'][$ifent]) && !isset($config['dhcpdv6'][$ifent]['enable']) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6'])))) || - (!is_array($config['dhcpdv6'][$ifent]) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6']))))) { + if ((!is_array($config['dhcpdv6'][$ifent]) || + !isset($config['dhcpdv6'][$ifent]['enable'])) && + !$valid_if_ipaddrv6) { continue; } |
