always set presult

diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index 652a623255854e6a61e29583a6640eb4c2b2612e..bd3592769682a585ac956e5431477211f3b4dda3 100644 (file)
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -645,11 +645,9 @@ static unlang_action_t unlang_module(REQUEST *request, rlm_rcode_t *presult)
         */
        if (request->master_state == REQUEST_STOP_PROCESSING) {
                RWARN("Module %s became unblocked", sp->module_instance->module->name);
-               if (ms->presult) {
-                       *ms->presult = rcode;
-               } else {
-                       *presult = rcode;
-               }
+               if (ms->presult) *ms->presult = rcode;
+
+               *presult = rcode;
                return UNLANG_ACTION_STOP_PROCESSING;
        }
 
@@ -684,13 +682,9 @@ done:
        }
 
        request->rcode = rcode;
-       if (ms->presult) {
-               *ms->presult = rcode;
-               return UNLANG_ACTION_CALCULATE_RESULT;
-       }
+       if (ms->presult) *ms->presult = rcode;
 
        *presult = rcode;
-
        return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
@@ -777,13 +771,9 @@ static unlang_action_t unlang_module_resume(REQUEST *request, rlm_rcode_t *presu
        }
 
        request->rcode = rcode;
-       if (ms->presult) {
-               *ms->presult = rcode;
-               return UNLANG_ACTION_CALCULATE_RESULT;
-       }
+       if (ms->presult) *ms->presult = rcode;
 
        *presult = rcode;
-
        return UNLANG_ACTION_CALCULATE_RESULT;
 }
 

diff --git a/src/lib/unlang/subrequest.c b/src/lib/unlang/subrequest.c
index 309a328b968ba899874e1e80f060554a37404112..353f1de44b16866e1bbd7a5e05f1080015292386 100644 (file)
--- a/src/lib/unlang/subrequest.c
+++ b/src/lib/unlang/subrequest.c
@@ -105,12 +105,9 @@ static unlang_action_t unlang_subrequest_resume(REQUEST *request, rlm_rcode_t *p
                 *      use it to modify the current section
                 *      rcode.
                 */
-               if (state->presult) {
-                       *state->presult = rcode;
-               } else {
-                       *presult = rcode;
-               }
+               if (state->presult) *state->presult = rcode;
 
+               *presult = rcode;
                return UNLANG_ACTION_CALCULATE_RESULT;
        }
 
@@ -174,13 +171,9 @@ static unlang_action_t unlang_subrequest(REQUEST *request, rlm_rcode_t *presult)
                         *      use it to modify the current section
                         *      rcode.
                         */
-                       if (state->presult) {
-                               *state->presult = rcode;
-                               return UNLANG_ACTION_CALCULATE_RESULT;
-                       }
+                       if (state->presult) *state->presult = rcode;
 
                        *presult = rcode;
-
                        return UNLANG_ACTION_CALCULATE_RESULT;
                }