diff options
author | Chris Buechler <cmb@pfsense.org> | 2014-12-04 15:58:21 -0600 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2014-12-04 21:00:57 -0600 |
commit | 590aa3e7b7d22068c6a10506025a84485d17bf79 (patch) | |
tree | fffafab62817b57f5341f23b56a1462c7a0c96c9 /etc | |
parent | 32a815611645f698ab8c35d7435e9041cb60960f (diff) | |
download | pfsense-590aa3e7b7d22068c6a10506025a84485d17bf79.zip pfsense-590aa3e7b7d22068c6a10506025a84485d17bf79.tar.gz |
After discussion with Ermal, remove this to force consumers to send things
properly. I fixed the scenario in Unbound where it was sending IPs to
these functions rather than an interface, so this has no functional diff.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/interfaces.inc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 2977461..74ab560 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -4798,9 +4798,6 @@ function ip_in_interface_alias_subnet($interface, $ipalias) { } function get_interface_ip($interface = "wan") { - // if we get passed an IP for some reason, return the IP. - if (is_ipaddr($interface)) - return $interface; $realif = get_failover_interface($interface); if (!$realif) { @@ -4820,10 +4817,6 @@ function get_interface_ip($interface = "wan") { function get_interface_ipv6($interface = "wan", $flush = false) { global $config; - // if we get passed an IP for some reason, return the IP. - if (is_ipaddr($interface)) - return $interface; - $realif = get_failover_interface($interface, "inet6"); if (!$realif) { if (strstr($interface, "_vip")) |