allow actions {...} in more sections

and document why they can't be in redundant, etc.

diff --git a/doc/antora/modules/reference/pages/unlang/actions.adoc b/doc/antora/modules/reference/pages/unlang/actions.adoc
index 553eadea4cdd89b67b9ec5c9df6f71326e46a997..b27b7887fa6d571d691eb139ccc35ad54fcf420f 100644 (file)
--- a/doc/antora/modules/reference/pages/unlang/actions.adoc
+++ b/doc/antora/modules/reference/pages/unlang/actions.adoc
@@ -28,10 +28,15 @@ following keywords:
 * `if`
 * `else`
 * `elsif`
+* `foreach`
 * `group`
+* `limit`
+* `switch`
 * `timeout`
 * `transaction`
 
+The `actions` block cannot be used for `redundant`, `redundant-load-balance`, or `load-balance` keywords.  Those sections already have default actions to take for the various return codes.  Allowing the `actions` block to over-ride those default actions would cause those sections to operate incorrectly.
+
 == Priorities
 
 Higher numbers mean higher priorities.  An rcode of `fail` with priority `3` will over-ride an rcode of `ok` with priority `1`,

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index dd5f86838f8b363461c24818360a4efcbf84f6b0..cf8c60b34cffee7d31f4a3768c0437a4e149f02b 100644 (file)
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -2014,7 +2014,7 @@ static bool compile_action_subsection(unlang_t *c, CONF_SECTION *cs, CONF_SECTIO
 
        /*
         *      Over-riding the actions can be done in certain limited
-        *      situations.  In other situations (e.g. "switch",
+        *      situations.  In other situations (e.g. "redundant", 
         *      "load-balance"), it doesn't make sense.
         *
         *      Note that this limitation also applies to "retry"
@@ -2029,7 +2029,10 @@ static bool compile_action_subsection(unlang_t *c, CONF_SECTION *cs, CONF_SECTIO
        case UNLANG_TYPE_IF:
        case UNLANG_TYPE_ELSE:
        case UNLANG_TYPE_ELSIF:
+       case UNLANG_TYPE_FOREACH:
        case UNLANG_TYPE_GROUP:
+       case UNLANG_TYPE_LIMIT:
+       case UNLANG_TYPE_SWITCH:
        case UNLANG_TYPE_TIMEOUT:
        case UNLANG_TYPE_TRANSACTION:
                break;