diff options
author | Phil Davis <phil.davis@inf.org> | 2016-12-27 16:54:40 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2016-12-27 16:54:40 +0545 |
commit | cf08b49e20810a0aa953561892b1d5bee353957e (patch) | |
tree | f09a42d70ef8b2e9e3403b5a0fa11dd86ac0bbba /src/etc/inc/unbound.inc | |
parent | c01bdca9ba2ddfed14285ff36e1f6508c4452717 (diff) | |
download | pfsense-cf08b49e20810a0aa953561892b1d5bee353957e.zip pfsense-cf08b49e20810a0aa953561892b1d5bee353957e.tar.gz |
Fix #3560 correctly handle disabled static routes
1) util.inc - add parameter to get_staticroutes() so the caller can
choose to see all static routes or only the ones that are currently
enabled.
2) filter.inc - just process enabled static routes when making direct
networks list, tonathosts etc.
3) services.inc - only include enabled static routes when making confogs
for DHCP(6) Relay.
4) unbound.inc - only include enable static routes in
unbound_acls_config
5) rc.newroutedns - only trigger if there is an enabled static route.
Note: GUI validation has been left as-is. e.g. in system_gateways we don
not allow to delete a gateway if there is a disabled static route using
it... If people want to delete "higher level" stuff, then they need to
first delete the disabled static route(s). Otherwise it will get rather
"risky" having disabled static routes in the config that refer to
gateways that no longer exist, or have a subnet range that now matches a
local interafce or...
Diffstat (limited to 'src/etc/inc/unbound.inc')
-rw-r--r-- | src/etc/inc/unbound.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/inc/unbound.inc b/src/etc/inc/unbound.inc index f073acf..332e266 100644 --- a/src/etc/inc/unbound.inc +++ b/src/etc/inc/unbound.inc @@ -712,7 +712,7 @@ function unbound_acls_config($cfgsubdir = "") { // add for IPv6 static routes to local networks // for safety, we include only routes reachable on an interface with no // gateway specified - read: not an Internet connection. - $static_routes = get_staticroutes(); + $static_routes = get_staticroutes(false, false, true); // Parameter 3 returnenabledroutesonly foreach ($static_routes as $route) { if ((lookup_gateway_interface_by_name($route['gateway']) == $ubif) && !interface_has_gateway($ubif)) { // route is on this interface, interface doesn't have gateway, add it |