X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Faction-executor.c;h=ca969074382174efb466c6cc278d31676d5bceda;hp=fc7d03d70a9fa4a3701ec5cce53ff98422df0a76;hb=ff588497b3dfc3138c9ce005e9270ed5568c05df;hpb=de559cf1823ecaf083c7c827c926b3aece32df71

diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c
index fc7d03d70..ca9690743 100644
--- a/src/bin/lttng-sessiond/action-executor.c
+++ b/src/bin/lttng-sessiond/action-executor.c
@@ -113,22 +113,21 @@ static bool is_trigger_allowed_for_session(const struct lttng_trigger *trigger,
 {
 	bool is_allowed = false;
 	const struct lttng_credentials session_creds = {
-		.uid = session->uid,
-		.gid = session->gid,
+		.uid = LTTNG_OPTIONAL_INIT_VALUE(session->uid),
+		.gid = LTTNG_OPTIONAL_INIT_VALUE(session->gid),
 	};
 	/* Can never be NULL. */
 	const struct lttng_credentials *trigger_creds =
 			lttng_trigger_get_credentials(trigger);
 
-	is_allowed = (trigger_creds->uid == session_creds.uid) ||
-			(trigger_creds->uid == 0);
+	is_allowed = (lttng_credentials_is_equal_uid(trigger_creds, &session_creds)) ||
+			(lttng_credentials_get_uid(trigger_creds) == 0);
 	if (!is_allowed) {
-		WARN("Trigger is not allowed to interact with session `%s`: session uid = %ld, session gid = %ld, trigger uid = %ld, trigger gid = %ld",
+		WARN("Trigger is not allowed to interact with session `%s`: session uid = %ld, session gid = %ld, trigger uid = %ld",
 				session->name,
 				(long int) session->uid,
 				(long int) session->gid,
-				(long int) trigger_creds->uid,
-				(long int) trigger_creds->gid);
+				(long int) lttng_credentials_get_uid(trigger_creds));
 	}
 
 	return is_allowed;