clean up FDs and PID in all situations

and don't complain on cleanup if the program exited cleanly.

Author: alandekok

src/lib/server/exec.c

@@ -683,7 +683,8 @@ void fr_exec_oneshot_cleanup(fr_exec_state_t *exec, int signal)
 
 	if (exec->pid >= 0) {
 		RDEBUG3("Cleaning up exec state for PID %u", exec->pid);
-	} else {
+
+	} else if (exec->failed != FR_EXEC_FAIL_NONE) {
 		RDEBUG3("Cleaning up failed exec");
 	}
 

src/modules/rlm_exec/rlm_exec.c

@@ -87,7 +87,7 @@ static xlat_action_t exec_xlat_oneshot_wait_resume(TALLOC_CTX *ctx, fr_dcursor_t
 	fr_exec_state_t	*exec = talloc_get_type_abort(xctx->rctx, fr_exec_state_t);
 	fr_value_box_t	*vb;
 
-	if (exec->failed == FR_EXEC_FAIL_TIMEOUT) {
+	if (exec->failed != FR_EXEC_FAIL_NONE) {
 		RPEDEBUG("Execution of external program failed");
 		return XLAT_ACTION_FAIL;
 	}
@@ -127,6 +127,12 @@ static xlat_arg_parser_t const exec_xlat_args[] = {
 	XLAT_ARG_PARSER_TERMINATOR
 };
 
+static int _exec_free(fr_exec_state_t *exec)
+{
+	fr_exec_oneshot_cleanup(exec, SIGKILL);
+	return 0;
+}
+
 /** Exec programs from an xlat
  *
  * Example:
@@ -174,6 +180,7 @@ static xlat_action_t exec_xlat_oneshot(TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out
 		talloc_free(exec);
 		return XLAT_ACTION_FAIL;
 	}
+	talloc_set_destructor(exec, _exec_free);
 
 	return unlang_xlat_yield(request, exec_xlat_oneshot_wait_resume, NULL, 0, exec);
 }