X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-consumerd%2Flttng-consumerd.c;fp=lttng-consumerd%2Flttng-consumerd.c;h=cf515a9df7cae5090f4f2537b1fda39342fcfffc;hp=dce188aced643c282f71f4f7d114ad92f05374e8;hb=67e407978a700da256ab4f58736002826c7be7c1;hpb=a9bddc022723613ed5d2439127c493fa900acde1

diff --git a/lttng-consumerd/lttng-consumerd.c b/lttng-consumerd/lttng-consumerd.c
index dce188ace..cf515a9df 100644
--- a/lttng-consumerd/lttng-consumerd.c
+++ b/lttng-consumerd/lttng-consumerd.c
@@ -251,13 +251,16 @@ int main(int argc, char **argv)
 	if (strlen(command_sock_path) == 0) {
 		switch (opt_type) {
 		case LTTNG_CONSUMER_KERNEL:
-			strcpy(command_sock_path, KCONSUMERD_CMD_SOCK_PATH);
+			snprintf(command_sock_path, PATH_MAX, KCONSUMERD_CMD_SOCK_PATH,
+					LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER64_UST:
-			strcpy(command_sock_path, USTCONSUMERD64_CMD_SOCK_PATH);
+			snprintf(command_sock_path, PATH_MAX,
+					USTCONSUMERD64_CMD_SOCK_PATH, LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER32_UST:
-			strcpy(command_sock_path, USTCONSUMERD32_CMD_SOCK_PATH);
+			snprintf(command_sock_path, PATH_MAX,
+					USTCONSUMERD32_CMD_SOCK_PATH, LTTNG_RUNDIR);
 			break;
 		default:
 			WARN("Unknown consumerd type");
@@ -275,13 +278,16 @@ int main(int argc, char **argv)
 	if (strlen(error_sock_path) == 0) {
 		switch (opt_type) {
 		case LTTNG_CONSUMER_KERNEL:
-			strcpy(error_sock_path, KCONSUMERD_ERR_SOCK_PATH);
+			snprintf(error_sock_path, PATH_MAX, KCONSUMERD_ERR_SOCK_PATH,
+					LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER64_UST:
-			strcpy(error_sock_path, USTCONSUMERD64_ERR_SOCK_PATH);
+			snprintf(error_sock_path, PATH_MAX,
+					USTCONSUMERD64_ERR_SOCK_PATH, LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER32_UST:
-			strcpy(error_sock_path, USTCONSUMERD32_ERR_SOCK_PATH);
+			snprintf(error_sock_path, PATH_MAX,
+					USTCONSUMERD32_ERR_SOCK_PATH, LTTNG_RUNDIR);
 			break;
 		default:
 			WARN("Unknown consumerd type");