From 0ce737072a77c6e173df223722b023f529bfb00d Mon Sep 17 00:00:00 2001
From: Gaurav <gaurav.sinha@vyatta.com>
Date: Mon, 27 Feb 2012 13:32:49 -0800
Subject: check presence of protocol config subtree (cherry picked from commit
 54ca4cdaa0c665763f6d14d94c3ef16fbdf014ed)

---
 scripts/vyatta-conntrack-timeouts.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/vyatta-conntrack-timeouts.pl b/scripts/vyatta-conntrack-timeouts.pl
index ce115e0..f1aa790 100644
--- a/scripts/vyatta-conntrack-timeouts.pl
+++ b/scripts/vyatta-conntrack-timeouts.pl
@@ -136,8 +136,8 @@ sub do_protocol_check {
   my ($rule) = @_;
   my $config = new Vyatta::Config;
   my $protocol_nos = $config->listNodes("system conntrack timeout custom rule $rule protocol");
-  if ($protocol_nos > 1) {
-    Vyatta::Config::outputError(["Conntrack"], "Conntrack config error: more than one protocol in rule $rule");
+  if (($protocol_nos > 1) or ($protocol_nos < 1)) {
+    Vyatta::Config::outputError(["Conntrack"], "Conntrack config error: please configure exactly one protocol in rule $rule");
     exit 1;
   }
 }
-- 
cgit v1.2.3