X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=6bb471a9dca0a3cc03b9448ec0b6be649a12e5e8;hp=0a78f27bad9e9e6f85ad9e86008030464b924a39;hb=4771f025b27e92983c1c0816c4cf5760d229c287;hpb=ce4500b0db50259c41d9f148ae3e8ecb2030683a

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 0a78f27ba..6bb471a9d 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -50,7 +50,7 @@
 #include "event.h"
 #include "futex.h"
 #include "hashtable.h"
-#include "kernel-ctl.h"
+#include "kernel.h"
 #include "lttng-sessiond.h"
 #include "shm.h"
 #include "ust-app.h"
@@ -1575,7 +1575,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 		}
 		case LTTNG_CONSUMER32_UST:
 		{
-			char *tmpnew;
+			char *tmpnew = NULL;
 
 			if (consumerd32_libdir[0] != '\0') {
 				char *tmp;