Port fix for update sections from v2.x.x

diff --git a/src/main/modcall.c b/src/main/modcall.c
index 08e7d20255ab237bfaf43dc8fc6b98e4f8509ef1..a372608b1c787f65c925886de2387140968c4277 100644 (file)
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -586,13 +586,14 @@ redo:
                        rcode = radius_map2request(request, map, "update", radius_map2vp, NULL);
                        if (rcode < 0) {
                                result = (rcode == -2) ? RLM_MODULE_INVALID : RLM_MODULE_FAIL;
+                               MOD_LOG_CLOSE_BRACE();
                                goto calculate_result;
                        }
                }
                
                result = RLM_MODULE_NOOP;
                MOD_LOG_CLOSE_BRACE();
-               goto next_sibling;
+               goto calculate_result;
        } /* MOD_IF */
 
        /*
@@ -1482,6 +1483,9 @@ static modcallable *do_compile_modupdate(modcallable *parent, UNUSED rlm_compone
        csingle->type = MOD_UPDATE;
        csingle->method = component;
 
+       memcpy(csingle->actions, defaultactions[component][GROUPTYPE_SIMPLE],
+              sizeof(csingle->actions));
+
        g->grouptype = GROUPTYPE_SIMPLE;
        g->children = NULL;
        g->cs = cs;