Update result only if we were told to evaluate the condition
authoraland <aland>
Mon, 11 Jun 2007 08:34:28 +0000 (08:34 +0000)
committeraland <aland>
Mon, 11 Jun 2007 08:34:28 +0000 (08:34 +0000)
src/main/evaluate.c

index 936a828..6e86409 100644 (file)
@@ -616,14 +616,14 @@ int radius_evaluate_condition(REQUEST *request, int depth,
                    ((p[0] == '|') && (p[1] == '|'))) {
                        DEBUG4(">>> AT EOL2a");
                        *ptr = p;
-                       *presult = result;
+                       if (evaluate_next_condition) *presult = result;
                        return TRUE;
                }
        } /* loop over the input condition */
 
        DEBUG4(">>> AT EOL2b");
        *ptr = p;
-       *presult = result;
+       if (evaluate_next_condition) *presult = result;
        return TRUE;
 }