diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 10:59:34 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 10:59:34 -0300 |
| commit | 270f81d9607be5f372a4bb89bbb53dd1e45a1f82 (patch) | |
| tree | b9511afa10dfd1b311606a74af707f000b50e9e4 /usr/local/www/firewall_aliases_import.php | |
| parent | 416686be4caf89487f98f6bade2c6a72887e9157 (diff) | |
| parent | 073a2697dd86a8dece8dafa28b71084a547ba31e (diff) | |
| download | pfsense-270f81d9607be5f372a4bb89bbb53dd1e45a1f82.zip pfsense-270f81d9607be5f372a4bb89bbb53dd1e45a1f82.tar.gz | |
Merge remote branch 'mainline/master' into 2_firewall
Conflicts:
usr/local/www/diag_nanobsd.php
usr/local/www/diag_packet_capture.php
usr/local/www/firewall_shaper.php
Diffstat (limited to 'usr/local/www/firewall_aliases_import.php')
| -rwxr-xr-x | usr/local/www/firewall_aliases_import.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php index 1902fd1..39311c4 100755 --- a/usr/local/www/firewall_aliases_import.php +++ b/usr/local/www/firewall_aliases_import.php @@ -38,7 +38,7 @@ ##|-PRIV -$reserved_keywords = array("pass", "out", "queue", "max", "min", "pptp"); +$reserved_keywords = array("pass", "out", "queue", "max", "min", "pptp", "pppoe", "L2TP", "OpenVPN", "IPsec"); require("guiconfig.inc"); require_once("util.inc"); |
