Revert "if we dereference it as a group, it has to be defined as a group"

This reverts commit 1469c414c666850bfacbf39b284f4ccd74f049fc.

diff --git a/src/lib/unlang/subrequest.c b/src/lib/unlang/subrequest.c
index 09412951d8ff47da15f783899fd1bdb20e6d34bc..bd61a8ce836d1aeb74f7627470e515569af225b1 100644 (file)
--- a/src/lib/unlang/subrequest.c
+++ b/src/lib/unlang/subrequest.c
@@ -392,22 +392,20 @@ void unlang_subrequest_free(REQUEST **child)
        *child = NULL;
 }
 
-static unlang_group_t subrequest_instruction = {
-       .self = {
-               .type = UNLANG_TYPE_SUBREQUEST,
-               .name = "subrequest",
-               .debug_name = "subrequest",
-               .actions = {
-                       [RLM_MODULE_REJECT]     = 0,
-                       [RLM_MODULE_FAIL]       = MOD_ACTION_RETURN,    /* Exit out of nested levels */
-                       [RLM_MODULE_OK]         = 0,
-                       [RLM_MODULE_HANDLED]    = 0,
-                       [RLM_MODULE_INVALID]    = 0,
-                       [RLM_MODULE_DISALLOW]   = 0,
-                       [RLM_MODULE_NOTFOUND]   = 0,
-                       [RLM_MODULE_NOOP]       = 0,
-                       [RLM_MODULE_UPDATED]    = 0
-               },
+static unlang_t subrequest_instruction = {
+       .type = UNLANG_TYPE_SUBREQUEST,
+       .name = "subrequest",
+       .debug_name = "subrequest",
+       .actions = {
+               [RLM_MODULE_REJECT]     = 0,
+               [RLM_MODULE_FAIL]       = MOD_ACTION_RETURN,    /* Exit out of nested levels */
+               [RLM_MODULE_OK]         = 0,
+               [RLM_MODULE_HANDLED]    = 0,
+               [RLM_MODULE_INVALID]    = 0,
+               [RLM_MODULE_DISALLOW]   = 0,
+               [RLM_MODULE_NOTFOUND]   = 0,
+               [RLM_MODULE_NOOP]       = 0,
+               [RLM_MODULE_UPDATED]    = 0
        },
 };
 
@@ -436,7 +434,7 @@ void unlang_subrequest_push(rlm_rcode_t *out, REQUEST *child,
        /*
         *      Push a new subrequest frame onto the stack
         */
-       unlang_interpret_push(child->parent, &subrequest_instruction.self, RLM_MODULE_UNKNOWN, UNLANG_NEXT_STOP, top_frame);
+       unlang_interpret_push(child->parent, &subrequest_instruction, RLM_MODULE_UNKNOWN, UNLANG_NEXT_STOP, top_frame);
        frame = &stack->frame[stack->depth];
 
        /*