X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=16a7925d6000ec2cc14da4b2d04270ed1caf14b6;hp=a878c0dbef96b57c3555672b1324d2b9ae6bd9fe;hb=bc8daafb693d284dbebb8311b125d38a3b8d7ef7;hpb=df62dbcd26798ca35926f8316a1b5734e825b84b

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index a878c0dbe..16a7925d6 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -2611,10 +2611,14 @@ int handle_notification_thread_command_register_trigger(
 				&evaluation, &object_uid,
 				&object_gid);
 		break;
+		LTTNG_OPTIONAL_SET(&object_creds.uid, object_uid);
+		LTTNG_OPTIONAL_SET(&object_creds.gid, object_gid);
 	case LTTNG_OBJECT_TYPE_CHANNEL:
 		ret = evaluate_channel_condition_for_client(condition, state,
 				&evaluation, &object_uid,
 				&object_gid);
+		LTTNG_OPTIONAL_SET(&object_creds.uid, object_uid);
+		LTTNG_OPTIONAL_SET(&object_creds.gid, object_gid);
 		break;
 	case LTTNG_OBJECT_TYPE_NONE:
 		ret = 0;
@@ -2630,9 +2634,6 @@ int handle_notification_thread_command_register_trigger(
 		goto error_put_client_list;
 	}
 
-	LTTNG_OPTIONAL_SET(&object_creds.uid, object_uid);
-	LTTNG_OPTIONAL_SET(&object_creds.gid, object_gid);
-
 	DBG("Newly registered trigger's condition evaluated to %s",
 			evaluation ? "true" : "false");
 	if (!evaluation) {