conf2: another bug hunted

diff --git a/lib/conf2.c b/lib/conf2.c
index fb0a2de6a534f311e8c06d0645f48c2bb93b1ca6..fe66610a0ca361e0df93afee48961f7f4b4fe1ca 100644 (file)
--- a/lib/conf2.c
+++ b/lib/conf2.c
@@ -802,7 +802,7 @@ opening_brace(struct cf_item *item, void *ptr, enum operation op)
     cf_init_section(item->name, item->u.sec, stack[level].base_ptr);
     stack[level].list = ptr;
     stack[level].item = item;
-    stack[level].op |= op < OP_REMOVE ? OP_2ND : OP_1ST;
+    stack[level].op |= (op & OP_MASK) < OP_REMOVE ? OP_2ND : OP_1ST;
   }
   else
     return "Opening brace can only be used on sections and lists";

diff --git a/lib/conf2.t b/lib/conf2.t
index 39f8b4e6464c3c56a8c26b71eb9f84e35cbfa5ca..bc79381b100261cf60fdbf04f86f9689155fd6db 100644 (file)
--- a/lib/conf2.t
+++ b/lib/conf2.t
@@ -24,6 +24,10 @@ unknown.ignored :-)
 
 top.slaves     cairns gpua 7 7 -10% +10%
 top.slaves     daintree rafc 4 5 -171%
+top.slaves     coogee pum 9 8
+top.slaves     {name=bondi; level=\
+  "PUG"; confidence    10 10}
+#top.slaves:remove
 
 topp.a=15
 top.nr1=   15