From 38149e2d28cb7b1f8296fbff84d61e5f378f3b89 Mon Sep 17 00:00:00 2001
From: Deepti Kulkarni <deepti@vyatta.com>
Date: Mon, 19 Dec 2011 14:57:28 -0800
Subject: Improved validation of command syntax. Resolved a typo.

---
 templates-cfg/system/conntrack/log/node.def        | 34 +---------------------
 .../conntrack/log/tcp/update/syn-received/node.def |  1 +
 .../log/tcp/update/sync-received/node.def          |  1 -
 3 files changed, 2 insertions(+), 34 deletions(-)
 create mode 100644 templates-cfg/system/conntrack/log/tcp/update/syn-received/node.def
 delete mode 100644 templates-cfg/system/conntrack/log/tcp/update/sync-received/node.def

(limited to 'templates-cfg')

diff --git a/templates-cfg/system/conntrack/log/node.def b/templates-cfg/system/conntrack/log/node.def
index cb7521a..83a613e 100644
--- a/templates-cfg/system/conntrack/log/node.def
+++ b/templates-cfg/system/conntrack/log/node.def
@@ -1,35 +1,3 @@
 help: Log connection tracking events per protocol
 priority: 219 # failure at log shouldnt fail conntrack 
-end:
-if [[ ${COMMIT_ACTION} != 'DELETE' ]]
-then
-  declare -a ARR;
-  declare -a EVENTS;
-  declare -a STATES;
-  eval "ARR=($(cli-shell-api listNodes system conntrack log))";
-  if [ "${#ARR[@]}" == "0" ]; then
-    echo Protocol must be specified for log;
-    exit 1;
-  fi
-  for var in "${ARR[@]}"
-  do
-    eval "EVENTS=($(cli-shell-api listNodes system conntrack log $var))";
-    if [ "${#EVENTS[@]}" == "0" ]; then
-      echo Event must be specified for specified protocol $var;
-      exit 1;
-    fi
-    if [ "$var" == "tcp" ]; then
-      for i in "${EVENTS[@]}"
-      do
-        if [ "$i" == "update" ]; then
-          eval "STATES=($(cli-shell-api listNodes system conntrack log $var $i))";
-          if [ "${#STATES[@]}" == "0" ]; then
-            echo State must be specified for specified protocol-event $var $i;
-            exit 1;
-          fi
-        fi
-      done
-    fi
-  done
-fi
-sudo /opt/vyatta/sbin/vyatta-update-conntrack-log.pl
+end: sudo /opt/vyatta/sbin/vyatta-update-conntrack-log.pl
diff --git a/templates-cfg/system/conntrack/log/tcp/update/syn-received/node.def b/templates-cfg/system/conntrack/log/tcp/update/syn-received/node.def
new file mode 100644
index 0000000..421a675
--- /dev/null
+++ b/templates-cfg/system/conntrack/log/tcp/update/syn-received/node.def
@@ -0,0 +1 @@
+help: Log updates to TCP connections in SYN_RECV state 
diff --git a/templates-cfg/system/conntrack/log/tcp/update/sync-received/node.def b/templates-cfg/system/conntrack/log/tcp/update/sync-received/node.def
deleted file mode 100644
index 421a675..0000000
--- a/templates-cfg/system/conntrack/log/tcp/update/sync-received/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Log updates to TCP connections in SYN_RECV state 
-- 
cgit v1.2.3