diff options
author | Renato Botelho <garga@FreeBSD.org> | 2013-10-16 09:16:00 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2013-10-16 09:18:10 -0300 |
commit | c48fdaa40effe9edc8bb4fb933e124a93cb24a0d (patch) | |
tree | e1549ed8b708fb27a6e08bd83edb3fe30976bcac /etc/inc/filter.inc | |
parent | c858a035120118e76010e73ac99b4e66ed0c4517 (diff) | |
download | pfsense-c48fdaa40effe9edc8bb4fb933e124a93cb24a0d.zip pfsense-c48fdaa40effe9edc8bb4fb933e124a93cb24a0d.tar.gz |
Fix #3268 - avoid pf table names conflict:
. Create a list of reserved table names for the hardcoded ones
. Use this list to validate aliases and load balance pool names
. Check if alias names don't conflict with LB pool names and vice-versa
Diffstat (limited to 'etc/inc/filter.inc')
-rw-r--r-- | etc/inc/filter.inc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 85058ca..479ec3a 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -58,6 +58,18 @@ $filterdns = array(); /* Used for aliases and interface macros */ $aliases = ""; +/* Reserved table names to avoid colision */ +$reserved_table_names = array( + "bogons", + "bogonsv6", + "negate_networks", + "snort2c", + "sshlockout", + "tonatsubnets", + "virusprot", + "vpn_networks", + "webConfiguratorlockout"); + function is_bogonsv6_used() { global $config, $g; # Only use bogonsv6 table if IPv6 Allow is on, and at least 1 enabled interface also has "blockbogons" enabled. |