X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=61f4ed52ba2dfffe98591e7e65b3ae7deef70336;hb=97e190465f6a2a7d5bf72f445bb4d9d8544a0916;hp=53d8d7ca539b836758d14a71d57bbb80b5ed0e36;hpb=80e327fa80045f6b470ac76963fc4b5d396a80a9;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 53d8d7ca5..61f4ed52b 100644
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -101,7 +101,7 @@ static const char *lttcomm_readable_code[] = {
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_UST_EVENT_NOT_FOUND)] = "UST event not found",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_UST_CONTEXT_EXIST)] = "UST context already exist",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_UST_CONTEXT_INVAL)] = "UST invalid context",
-	[ LTTCOMM_ERR_INDEX(LTTCOMM_NEED_ROOT_SESSIOND) ] = "A root lttng-sessiond needs to be running, and client user part of the \"tracing\" group, to interact with kernel tracing",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_NEED_ROOT_SESSIOND) ] = "Tracing the kernel requires a root lttng-sessiond daemon and \"tracing\" group user membership",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_TRACE_ALREADY_STARTED) ] = "Tracing already started",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_TRACE_ALREADY_STOPPED) ] = "Tracing already stopped",
 
@@ -299,7 +299,7 @@ ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
 		 * Only warn about EPIPE when quiet mode is deactivated.
 		 * We consider EPIPE as expected.
 		 */
-		if (errno != EPIPE || !opt_quiet) {
+		if (errno != EPIPE || !lttng_opt_quiet) {
 			PERROR("sendmsg");
 		}
 	}
@@ -370,7 +370,7 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 		 * Only warn about EPIPE when quiet mode is deactivated.
 		 * We consider EPIPE as expected.
 		 */
-		if (errno != EPIPE || !opt_quiet) {
+		if (errno != EPIPE || !lttng_opt_quiet) {
 			PERROR("sendmsg");
 		}
 	}
@@ -489,7 +489,7 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 		 * Only warn about EPIPE when quiet mode is deactivated.
 		 * We consider EPIPE as expected.
 		 */
-		if (errno != EPIPE || !opt_quiet) {
+		if (errno != EPIPE || !lttng_opt_quiet) {
 			PERROR("sendmsg");
 		}
 	}