actions: set error on act_call

1 files changed, 13 insertions, 0 deletions

diff --git a/actions.c b/actions.c
index 8e740e0..ff8ff93 100644
--- a/actions.c
+++ b/actions.c
@@ -181,10 +181,23 @@ int do_actions(void *data, struct action actions[], unsigned int n_actions, int
 			c.args = &actions[i].call;
 			c.pid = pid;
 			if (do_call(&c) == -1) {
+				resp.error = -1;
+				if (send_target(&resp, notifyfd) == -1)
+					return -1;
+			}
+			if (c.err != 0) {
 				resp.error = c.err;
 				if (send_target(&resp, notifyfd) == -1)
 					return -1;
 			}
+			/*
+			 * The result of the call needs to be save as
+			 * reference
+			 */
+			if (actions[i].call.has_ret) {
+				memcpy(data + actions[i].call.ret_off,
+					   &c.ret, sizeof(c.ret));
+			}
 			break;
 		case A_BLOCK:
 			resp.id = id;