X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=8b512f01d8dcda417c41c0c11dcb3aaca7ca1d5f;hb=990570edd474b304d4c935d82be6201d872025e4;hp=0d1a916c2b0f7e40abf5a0c15bc5b1cbf33b0166;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 0d1a916c2..8b512f01d 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -42,11 +42,12 @@
 #include <common/lttngerr.h>
 #include <common/kernel-consumer/kernel-consumer.h>
 #include <common/ust-consumer/ust-consumer.h>
-#include <common/runas.h>
+#include <common/common.h>
+#include <common/defaults.h>
+#include <common/compat/poll.h>
 
 #include "lttng-sessiond.h"
 #include "channel.h"
-#include "compat/poll.h"
 #include "context.h"
 #include "event.h"
 #include "futex.h"
@@ -4169,14 +4170,14 @@ static void sighandler(int sig)
 {
 	switch (sig) {
 	case SIGPIPE:
-		DBG("SIGPIPE catched");
+		DBG("SIGPIPE caugth");
 		return;
 	case SIGINT:
-		DBG("SIGINT catched");
+		DBG("SIGINT caugth");
 		stop_threads();
 		break;
 	case SIGTERM:
-		DBG("SIGTERM catched");
+		DBG("SIGTERM caugth");
 		stop_threads();
 		break;
 	default:
@@ -4278,7 +4279,7 @@ int main(int argc, char **argv)
 	is_root = !getuid();
 
 	if (is_root) {
-		rundir = strdup(LTTNG_RUNDIR);
+		rundir = strdup(DEFAULT_LTTNG_RUNDIR);
 
 		/* Create global run dir with root access */
 		ret = create_lttng_rundir(rundir);
@@ -4325,7 +4326,7 @@ int main(int argc, char **argv)
 		 * Create rundir from home path. This will create something like
 		 * $HOME/.lttng
 		 */
-		ret = asprintf(&rundir, LTTNG_HOME_RUNDIR, home_path);
+		ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
 		if (ret < 0) {
 			ret = -ENOMEM;
 			goto error;