From: Jonathan Rajotte Date: Wed, 23 Sep 2020 20:13:37 +0000 (-0400) Subject: action-executor: evaluated object credentials are optional X-Git-Tag: v2.13.0-rc1~426 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=c203f0585aa3a3b1c2b1994899b8277ed79dad2d;hp=e6887944f09a8985efb521ea638b4dfe557ff4ed action-executor: evaluated object credentials are optional Use the is_set member instead of the LTTNG_OPTIONAL_GET_PTR macro which asserts whenever an optional member is unset. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau Change-Id: Ia00e4a7f5f9b8198061a742bf6bd750c721908cf --- diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c index 4f027fdb9..5459c4b5e 100644 --- a/src/bin/lttng-sessiond/action-executor.c +++ b/src/bin/lttng-sessiond/action-executor.c @@ -198,7 +198,9 @@ static int action_executor_notify_handler(struct action_executor *executor, lttng_trigger_get_const_condition(work_item->trigger), work_item->evaluation, lttng_trigger_get_credentials(work_item->trigger), - LTTNG_OPTIONAL_GET_PTR(work_item->object_creds), + work_item->object_creds.is_set ? + &(work_item->object_creds.value) : + NULL, client_handle_transmission_status, executor); }