X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=8e794bdf4365be1779c2f0bb94c5e99dae5b03ee;hb=b09c7c76bc6f409ed9c303c81cba168234700568;hp=e990c34843f7eba9d21d0f2df5e8d43dbc750882;hpb=ae8564917fa3cb3497ec17951d8ac0ee28de9c81;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index e990c3484..8e794bdf4 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -2032,14 +2032,16 @@ static int list_lttng_ust_global_events(char *channel_name,
 			tmp[i].type = LTTNG_EVENT_FUNCTION;
 			break;
 		}
-		strncpy(tmp[i].loglevel, uevent->attr.loglevel, LTTNG_SYMBOL_NAME_LEN);
-		tmp[i].loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+		tmp[i].loglevel = uevent->attr.loglevel;
 		switch (uevent->attr.loglevel_type) {
-		case LTTNG_UST_LOGLEVEL:
-			tmp[i].type = LTTNG_EVENT_LOGLEVEL;
+		case LTTNG_UST_LOGLEVEL_ALL:
+			tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 			break;
-		case LTTNG_UST_LOGLEVEL_ONLY:
-			tmp[i].type = LTTNG_EVENT_LOGLEVEL_ONLY;
+		case LTTNG_UST_LOGLEVEL_RANGE:
+			tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_RANGE;
+			break;
+		case LTTNG_UST_LOGLEVEL_SINGLE:
+			tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE;
 			break;
 		}
 		i++;
@@ -3897,17 +3899,12 @@ end:
  */
 static int check_existing_daemon(void)
 {
-	if (access(client_unix_sock_path, F_OK) < 0 &&
-			access(apps_unix_sock_path, F_OK) < 0) {
-		return 0;
-	}
-
 	/* Is there anybody out there ? */
 	if (lttng_session_daemon_alive()) {
 		return -EEXIST;
-	} else {
-		return 0;
 	}
+
+	return 0;
 }
 
 /*