More / better errors and tests

diff --git a/src/main/parser.c b/src/main/parser.c
index 7fbd6f6..a6bfde2 100644 (file)
--- a/src/main/parser.c
+++ b/src/main/parser.c
@@ -280,12 +280,22 @@ static ssize_t condition_tokenize(TALLOC_CTX *ctx, char const *start, int brace,
        }
 
        /*
-        *      !COND == !(COND)
+        *      !COND
         */
        if (*p == '!') {
                p++;
                c->negate = TRUE;
                while (isspace((int) *p)) p++; /* skip spaces after negation */
+
+               /*
+                *  Just for stupidity
+                */
+               if (*p == '!') {
+                       talloc_free(c);
+                       COND_DEBUG("RETURN %d", __LINE__);
+                       *error = "Double negation is invalid";
+                       return -(p - start);
+               }
        }
 
        /*

diff --git a/src/tests/condition.txt b/src/tests/condition.txt
index c5094a7..36fea4c 100644 (file)
--- a/src/tests/condition.txt
+++ b/src/tests/condition.txt
@@ -69,6 +69,15 @@ data a == b
 condition (!a)
 data !a
 
+condition !(a)
+data !a
+
+condition !!a
+data ERROR offset 1 Double negation is invalid
+
+condition !(!a)
+data a
+
 #
 #  Hmm... these next two should really be identical.
 #