Use install path for exec()

[lttng-tools.git] / ltt-sessiond / main.c

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 44b0c84ba0bedf98f301c237fbf57e1994660a79..63e99df386610b79f79e4f618020c9e67964137b 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -914,7 +914,7 @@ static pid_t spawn_kconsumerd(void)
                /*
                 * Exec kconsumerd.
                 */
-               execlp("ltt-kconsumerd", "ltt-kconsumerd", "--verbose", NULL);
+               execl(INSTALL_PATH "/ltt-kconsumerd", "ltt-kconsumerd", "--quiet", NULL);
                if (errno != 0) {
                        perror("kernel start consumer exec");
                }
@@ -1118,7 +1118,7 @@ error:
  */
 static int start_kernel_trace(struct ltt_kernel_session *session)
 {
-       int ret;
+       int ret = 0;
 
        if (session->kconsumer_fds_sent == 0) {
                ret = send_kconsumerd_fds(kconsumerd_cmd_sock, session);
@@ -1246,7 +1246,7 @@ static void list_lttng_sessions(struct lttng_session *sessions)
  */
 static int process_client_msg(struct command_ctx *cmd_ctx)
 {
-       int ret;
+       int ret = LTTCOMM_OK;
 
        DBG("Processing client command %d", cmd_ctx->lsm->cmd_type);
 
@@ -1646,7 +1646,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
                                }
 
                                ret = kernel_create_channel(cmd_ctx->session->kernel_session,
-                                               &cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path);
+                                               chan, cmd_ctx->session->path);
                                if (ret < 0) {
                                        ret = LTTCOMM_KERN_CHAN_FAIL;
                                        goto error;