summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMohit Mehta <mohit@vyatta.com>2010-10-01 11:10:56 -0700
committerMohit Mehta <mohit@vyatta.com>2010-10-01 11:10:56 -0700
commitc1a36bdbc0c01cf834b63e62d80e3eeefe33172f (patch)
tree1be89b864ec412434c4694ff4572fb3560d2a311 /lib
parent817d13b8a92530376453d40987dddcc05a61e832 (diff)
downloadvyatta-cfg-c1a36bdbc0c01cf834b63e62d80e3eeefe33172f.tar.gz
vyatta-cfg-c1a36bdbc0c01cf834b63e62d80e3eeefe33172f.zip
Fix Bug 6225 Unable to assign a pppoe interface to zone
* change check for fw applied to an interface
Diffstat (limited to 'lib')
-rwxr-xr-xlib/Vyatta/Zone.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Vyatta/Zone.pm b/lib/Vyatta/Zone.pm
index eccf8ab..0e4981f 100755
--- a/lib/Vyatta/Zone.pm
+++ b/lib/Vyatta/Zone.pm
@@ -176,7 +176,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";