X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=04846abf57f0ffcea7d119898197163ac998774e;hb=8a82be4c62d09a7ef4792c0eed7c7903dfac8424;hp=8a2ef85b7345c33d89cd2914134bd075a71b4e9e;hpb=d7b377ed1acd4043bde353d99122e0e56fa4e975;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index 8a2ef85b7..04846abf5 100644
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -31,6 +31,7 @@
 #include <signal.h>
 #include <stddef.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "client.h"
 #include "lttng-sessiond.h"
@@ -1281,9 +1282,17 @@ error_add_context:
 						.value_type;
 		struct process_attr_value *value;
 		enum lttng_error_code ret_code;
+		long login_name_max;
+
+		login_name_max = sysconf(_SC_LOGIN_NAME_MAX);
+		if (login_name_max < 0) {
+			PERROR("Failed to get _SC_LOGIN_NAME_MAX system configuration");
+			ret = LTTNG_ERR_INVALID;
+			goto error;
+		}
 
 		/* Receive remaining variable length payload if applicable. */
-		if (name_len > LOGIN_NAME_MAX) {
+		if (name_len > login_name_max) {
 			/*
 			 * POSIX mandates user and group names that are at least
 			 * 8 characters long. Note that although shadow-utils
@@ -1291,9 +1300,9 @@ error_add_context:
 			 * limit (from bits/utmp.h, UT_NAMESIZE),
 			 * LOGIN_NAME_MAX is defined to 256.
 			 */
-			ERR("Rejecting process attribute tracker value %s as the provided exceeds the maximal allowed length: argument length = %zu, maximal length = %d",
+			ERR("Rejecting process attribute tracker value %s as the provided exceeds the maximal allowed length: argument length = %zu, maximal length = %ld",
 					add_value ? "addition" : "removal",
-					name_len, LOGIN_NAME_MAX);
+					name_len, login_name_max);
 			ret = LTTNG_ERR_INVALID;
 			goto error;
 		}
@@ -2024,8 +2033,41 @@ error_add_context:
 	}
 	case LTTNG_REGISTER_TRIGGER:
 	{
+		struct lttng_trigger *return_trigger;
+		size_t original_payload_size;
+		size_t payload_size;
+
+		ret = setup_empty_lttng_msg(cmd_ctx);
+		if (ret) {
+			ret = LTTNG_ERR_NOMEM;
+			goto setup_error;
+		}
+
+		original_payload_size = cmd_ctx->reply_payload.buffer.size;
+
 		ret = cmd_register_trigger(cmd_ctx, *sock,
-				notification_thread_handle);
+				notification_thread_handle, &return_trigger);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		ret = lttng_trigger_serialize(return_trigger, &cmd_ctx->reply_payload);
+		if (ret) {
+			ERR("Failed to serialize trigger in reply to \"register trigger\" command");
+			ret = LTTNG_ERR_NOMEM;
+			lttng_trigger_destroy(return_trigger);
+			goto error;
+		}
+
+		lttng_trigger_destroy(return_trigger);
+		return_trigger = NULL;
+
+		payload_size = cmd_ctx->reply_payload.buffer.size -
+			original_payload_size;
+
+		update_lttng_msg(cmd_ctx, 0, payload_size);
+
+		ret = LTTNG_OK;
 		break;
 	}
 	case LTTNG_UNREGISTER_TRIGGER: