From: Arran Cudbard-Bell Date: Wed, 8 Sep 2021 17:36:52 +0000 (-0500) Subject: Formatting X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ee495a91dcf729d2adf926ff2854b735b9e4d36;p=thirdparty%2Ffreeradius-server.git Formatting --- diff --git a/src/lib/server/exec.h b/src/lib/server/exec.h index 615d5f98a1f..a2725eb1ae7 100644 --- a/src/lib/server/exec.h +++ b/src/lib/server/exec.h @@ -84,7 +84,7 @@ void fr_exec_cleanup(fr_exec_state_t *exec, int signal); int fr_exec_fork_nowait(request_t *request, fr_value_box_list_t *vb_list, fr_pair_list_t *env_pairs); int fr_exec_fork_wait(pid_t *pid_p, int *stdin_fd, int *stdout_fd, int *stderr_fd, - request_t *request, fr_value_box_list_t *vb_list, fr_pair_list_t *env_pairs); + request_t *request, fr_value_box_list_t *vb_list, fr_pair_list_t *env_pairs); int fr_exec_start(TALLOC_CTX *ctx, fr_exec_state_t *exec, request_t *request, fr_value_box_list_t *vb_list, fr_pair_list_t *env_pairs, diff --git a/src/lib/unlang/tmpl.c b/src/lib/unlang/tmpl.c index 7bd9b200174..244fef8ecdf 100644 --- a/src/lib/unlang/tmpl.c +++ b/src/lib/unlang/tmpl.c @@ -167,10 +167,10 @@ static unlang_action_t unlang_tmpl_exec_wait_resume(rlm_rcode_t *p_result, reque unlang_frame_state_tmpl_t *state = talloc_get_type_abort(frame->state, unlang_frame_state_tmpl_t); if (fr_exec_start(state->ctx, &state->exec, request, - &state->box, state->args.exec.env, - false, - (state->out != NULL), state, - state->args.exec.timeout) < 0) { + &state->box, state->args.exec.env, + false, + (state->out != NULL), state, + state->args.exec.timeout) < 0) { *p_result = RLM_MODULE_FAIL; return UNLANG_ACTION_CALCULATE_RESULT; } diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c index e0ab03e9cda..e49a57e8345 100644 --- a/src/modules/rlm_exec/rlm_exec.c +++ b/src/modules/rlm_exec/rlm_exec.c @@ -140,9 +140,9 @@ static xlat_action_t exec_xlat(TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out, reques MEM(exec = talloc_zero(request, fr_exec_state_t)); /* Fixme - Should be frame ctx */ if (fr_exec_start(exec, exec, request, in, input_pairs, - false, - inst->wait, ctx, - inst->timeout) < 0) { + false, + inst->wait, ctx, + inst->timeout) < 0) { talloc_free(exec); return XLAT_ACTION_FAIL; }