From c86a6b00e60689dcf6d724b52def6dbecbe01873 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Fri, 1 Feb 2008 17:10:35 -0800
Subject: fix for bug 2211: "commit:expression:" checks are not evaluated at
 "set" time.

---
 src/cli_new.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/cli_new.c b/src/cli_new.c
index dceeaa6..353babd 100644
--- a/src/cli_new.c
+++ b/src/cli_new.c
@@ -1050,9 +1050,10 @@ static boolean check_syn_func(vtw_node *cur,const char* func,int line)
 
   switch(cur->vtw_node_oper) {
   case LIST_OP:
-    ret = check_syn(cur->vtw_node_left);
-    if (!is_in_commit() && cur->vtw_node_aux)
-      ret = TRUE;
+    ret = TRUE;
+    if (is_in_commit() || !cur->vtw_node_aux) {
+      ret = check_syn(cur->vtw_node_left);
+    }
     if (!ret || !cur->vtw_node_right) /* or no right operand */
       return ret;
     return check_syn(cur->vtw_node_right);
-- 
cgit v1.2.3