diff options
author | Phil Davis <phil.davis@world.inf.org> | 2014-01-06 07:02:10 -0800 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-01-07 07:41:04 -0200 |
commit | 7c2ea0cc224e61adad1ffa14b23b8e4213c06f86 (patch) | |
tree | f1a655856b9985fe5dd2ccca103e8631ef8c3273 /usr | |
parent | 0959b4d3ac7a624f2c45034a22ee93c32d42de72 (diff) | |
download | pfsense-7c2ea0cc224e61adad1ffa14b23b8e4213c06f86.zip pfsense-7c2ea0cc224e61adad1ffa14b23b8e4213c06f86.tar.gz |
Update reserved_keywords checks to match firewall_aliases_edit
firewall_aliases_import should have the same checks for reserved names as firewall_aliases_edit
This code should really be in a function in a common include file, but which one is the appropriate one?
For now I made the checks the same.
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/firewall_aliases_import.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php index b210003..c86a218 100755 --- a/usr/local/www/firewall_aliases_import.php +++ b/usr/local/www/firewall_aliases_import.php @@ -38,7 +38,8 @@ ##|-PRIV -$reserved_keywords = array("pass", "out", "queue", "max", "min", "pptp", "pppoe", "L2TP", "OpenVPN", "IPsec"); +// Keywords not allowed in names +$reserved_keywords = array("all", "pass", "block", "out", "queue", "max", "min", "pptp", "pppoe", "L2TP", "OpenVPN", "IPsec"); require("guiconfig.inc"); require_once("util.inc"); @@ -47,8 +48,13 @@ require("shaper.inc"); $pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Bulk import")); +// Add all Load balance names to reserved_keywords +if (is_array($config['load_balancer']['lbpool'])) + foreach ($config['load_balancer']['lbpool'] as $lbpool) + $reserved_keywords[] = $lbpool['name']; + $reserved_ifs = get_configured_interface_list(false, true); -$reserved_keywords = array_merge($reserved_keywords, $reserved_ifs); +$reserved_keywords = array_merge($reserved_keywords, $reserved_ifs, $reserved_table_names); if (!is_array($config['aliases']['alias'])) $config['aliases']['alias'] = array(); |