Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg into jenner

2 files changed, 12 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index e3361a5..216ea17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-cfg (0.14.91+jenner24) unstable; urgency=low
+
+  * add function to check if a firewall ruleset isActive
+
+ -- Mohit Mehta <mohit.mehta@vyatta.com>  Thu, 02 Jul 2009 12:19:37 -0700
+
 vyatta-cfg (0.14.91+jenner23) unstable; urgency=low
 
   * fixed isActive() api to now support mixed level and passed in
diff --git a/lib/Vyatta/Zone.pm b/lib/Vyatta/Zone.pm
index fd224b0..4b169b5 100755
--- a/lib/Vyatta/Zone.pm
+++ b/lib/Vyatta/Zone.pm
@@ -49,6 +49,12 @@ sub run_cmd {
     return $error;
 }
 
+sub is_fwruleset_active {
+    my ($value_func, $ruleset_type, $fw_ruleset) = @_;
+    my $config = new Vyatta::Config;
+    return $config->$value_func("firewall $ruleset_type $fw_ruleset");
+}
+
 sub get_all_zones {
     my $value_func = shift;
     my $config = new Vyatta::Config;