From 4918348bcbdecb482dc6dfe8cb296780c7a31cfd Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit@vyatta.com>
Date: Fri, 1 Oct 2010 11:10:56 -0700
Subject: Fix Bug 6225 Unable to assign a pppoe interface to zone * change
 check for fw applied to an interface (cherry picked from commit
 c1a36bdbc0c01cf834b63e62d80e3eeefe33172f)

---
 lib/Vyatta/Zone.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

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";
-- 
cgit v1.2.3