functions are single-thing expansions, too

diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c
index f6b68634f5eadbaebe2868df941ac3a0764021ef..8cc55da704e4bf30fbef121967296c213790aa19 100644 (file)
--- a/src/lib/server/cf_file.c
+++ b/src/lib/server/cf_file.c
@@ -2435,12 +2435,15 @@ check_for_eol:
                char const *ptr2 = ptr;
 
                /*
-                *      In most cases, this is just one word.  In some cases it's not.  So we peek ahead to see.
+                *      If the RHS is an expression (foo) or function %foo(), then mark it up as an expression.
                 */
-               if ((*ptr != '(') && (cf_get_token(parent, &ptr2, &value_token, buff[2], stack->bufsize,
-                                                  frame->filename, frame->lineno) == 0)) {
+               if ((*ptr == '(') || (*ptr == '%')) {
+                       /* nothing  */
+
+               } else if (cf_get_token(parent, &ptr2, &value_token, buff[2], stack->bufsize,
+                                       frame->filename, frame->lineno) == 0) {
                        /*
-                        *      The thing after the token is "end of line" in some format, so it's fine.
+                        *      We have one token (bare word), followed by EOL.  It's just a token.
                         */
                        fr_skip_whitespace(ptr2);
                        if (terminal_end_line[(uint8_t) *ptr2]) {