diff options
| author | Mohit Mehta <mohit@vyatta.com> | 2010-10-01 11:10:56 -0700 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2010-10-05 16:46:45 -0700 |
| commit | 4918348bcbdecb482dc6dfe8cb296780c7a31cfd (patch) | |
| tree | ef6df1205ff4a461e3accd763ab0edcd746b5893 | |
| parent | d94e705baff6a590d8d6bac64257e167005da14d (diff) | |
| download | vyatta-cfg-4918348bcbdecb482dc6dfe8cb296780c7a31cfd.tar.gz vyatta-cfg-4918348bcbdecb482dc6dfe8cb296780c7a31cfd.zip | |
Fix Bug 6225 Unable to assign a pppoe interface to zone
* change check for fw applied to an interface
(cherry picked from commit c1a36bdbc0c01cf834b63e62d80e3eeefe33172f)
| -rwxr-xr-x | lib/Vyatta/Zone.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Vyatta/Zone.pm b/lib/Vyatta/Zone.pm index 4b169b5..aca317a 100755 --- a/lib/Vyatta/Zone.pm +++ b/lib/Vyatta/Zone.pm @@ -186,7 +186,9 @@ sub validity_checks { if ($intf) { my $config = new Vyatta::Config; $config->setLevel($intf->path()); - if ($config->exists("firewall")) { + if ($config->exists("firewall in name") || + $config->exists("firewall out name") || + $config->exists("firewall local name")) { $returnstring = "interface $interface has firewall configured, " . "cannot be defined under a zone"; |