X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=e9192900892acb831fdc32ab160bc7c9f3e28a5b;hp=08c7d4339f009b120683dfb2de44b310cf7dd0cc;hb=e7c82272448caa21916b68c9824e32aab5c4a81b;hpb=7c1d2758d663ac5f119eae6849e50b56546a0c48

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 08c7d4339..e91929008 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -597,8 +597,8 @@ error:
 }
 
 /*
- * Return the agent default event name to use by testing if the process is root
- * or not. Return NULL on error.
+ * Return the default event name associated with the provided UST domain. Return
+ * NULL on error.
  */
 const char *event_get_default_agent_ust_name(enum lttng_domain_type domain)
 {
@@ -606,21 +606,13 @@ const char *event_get_default_agent_ust_name(enum lttng_domain_type domain)
 
 	switch (domain) {
 	case LTTNG_DOMAIN_LOG4J:
-		if (is_root) {
-			default_event_name = DEFAULT_SYS_LOG4J_EVENT_NAME;
-		} else {
-			default_event_name = DEFAULT_USER_LOG4J_EVENT_NAME;
-		}
+		default_event_name = DEFAULT_LOG4J_EVENT_NAME;
 		break;
 	case LTTNG_DOMAIN_JUL:
-		if (is_root) {
-			default_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
-		} else {
-			default_event_name = DEFAULT_USER_JUL_EVENT_NAME;
-		}
+		default_event_name = DEFAULT_JUL_EVENT_NAME;
 		break;
 	case LTTNG_DOMAIN_PYTHON:
-		default_event_name = DEFAULT_USER_PYTHON_EVENT_NAME;
+		default_event_name = DEFAULT_PYTHON_EVENT_NAME;
 		break;
 	default:
 		assert(0);