X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=947c35db7cda8c92bd44bbe55fcc40513ed26698;hb=1b0bfc2bc022d1e50462b2ef6796c7403067f2d7;hp=ee50db21e38b2c29a400b1ccec0065f72f28900c;hpb=87597c2c3bbaa1502ad2025cbf16704829f3b464;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index ee50db21e..947c35db7 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -51,6 +51,7 @@
 #include <common/config/session-config.h>
 #include <common/dynamic-buffer.h>
 #include <lttng/userspace-probe-internal.h>
+#include <lttng/event-internal.h>
 
 #include "lttng-sessiond.h"
 #include "buffer-registry.h"
@@ -2501,7 +2502,8 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			} else if (stat(INSTALL_BIN_PATH "/" DEFAULT_CONSUMERD_FILE, &st) == 0) {
 				DBG3("Found location #2");
 				consumer_to_use = INSTALL_BIN_PATH "/" DEFAULT_CONSUMERD_FILE;
-			} else if (stat(config.consumerd32_bin_path.value, &st) == 0) {
+			} else if (config.consumerd32_bin_path.value &&
+					stat(config.consumerd32_bin_path.value, &st) == 0) {
 				DBG3("Found location #3");
 				consumer_to_use = config.consumerd32_bin_path.value;
 			} else {
@@ -3100,7 +3102,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_UNREGISTER_TRIGGER:
 	case LTTNG_ROTATE_SESSION:
 	case LTTNG_ROTATION_GET_INFO:
-	case LTTNG_SESSION_GET_CURRENT_OUTPUT:
 	case LTTNG_ROTATION_SET_SCHEDULE:
 	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
 		need_domain = 0;
@@ -4322,28 +4323,6 @@ error_add_context:
 		ret = LTTNG_OK;
 		break;
 	}
-	case LTTNG_SESSION_GET_CURRENT_OUTPUT:
-	{
-		struct lttng_session_get_current_output_return output_return;
-
-		memset(&output_return, 0, sizeof(output_return));
-		ret = cmd_session_get_current_output(cmd_ctx->session,
-				&output_return);
-		if (ret < 0) {
-			ret = -ret;
-			goto error;
-		}
-
-		ret = setup_lttng_msg_no_cmd_header(cmd_ctx, &output_return,
-				sizeof(output_return));
-		if (ret < 0) {
-			ret = -ret;
-			goto error;
-		}
-
-		ret = LTTNG_OK;
-		break;
-	}
 	case LTTNG_ROTATION_SET_SCHEDULE:
 	{
 		bool set_schedule;