X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=52b5263d89ae34c046be44c94766caf94bb1be9e;hp=d0a117f4be1dba076b877b226162cf74fbc71ac3;hb=3204017e17704001c83085d94c2a8fc72e1aad16;hpb=eb441106665e76ce743f9086b1dc37e23a0ac0e9

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index d0a117f4b..52b5263d8 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -18,6 +18,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <common/bytecode/bytecode.h>
 #include <common/common.h>
 #include <common/compat/errno.h>
 #include <common/compat/string.h>
@@ -45,7 +46,6 @@
 
 #include <common/filter/filter-ast.h>
 #include <common/filter/filter-parser.h>
-#include <common/filter/filter-bytecode.h>
 #include <common/filter/memstream.h>
 #include "lttng-ctl-helper.h"
 
@@ -1270,15 +1270,15 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 
 		assert(fd_count == 0 || fd_count == 1);
 		if (fd_count == 1) {
-			struct fd_handle *handle =
+			struct fd_handle *h =
 					lttng_payload_view_pop_fd_handle(&view);
 
-			if (!handle) {
+			if (!h) {
 				goto mem_error;
 			}
 
-			fd_to_send = fd_handle_get_fd(handle);
-			fd_handle_put(handle);
+			fd_to_send = fd_handle_get_fd(h);
+			fd_handle_put(h);
 		}
 
 		ret = lttng_ctl_ask_sessiond_fds_varlen(&lsm,
@@ -2070,7 +2070,7 @@ int lttng_destroy_session_no_wait(const char *session_name)
 	enum lttng_error_code ret_code;
 
 	ret_code = lttng_destroy_session_ext(session_name, NULL);
-	return ret_code == LTTNG_OK ? ret_code : -ret_code;
+	return ret_code == LTTNG_OK ? 0 : -ret_code;
 }
 
 /*
@@ -3147,18 +3147,18 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 		goto end;
 	}
 
-	/*
-	 * This is needed to populate the trigger object size for the command
-	 * header.
-	*/
-	message_lsm = (struct lttcomm_session_msg *) message.buffer.data;
-
 	ret = lttng_trigger_serialize(trigger, &message);
 	if (ret < 0) {
 		ret = -LTTNG_ERR_UNK;
 		goto end;
 	}
 
+	/*
+	 * This is needed to populate the trigger object size for the command
+	 * header.
+	 */
+	message_lsm = (struct lttcomm_session_msg *) message.buffer.data;
+
 	message_lsm->u.trigger.length = (uint32_t) message.buffer.size - sizeof(lsm);
 
 	{
@@ -3201,13 +3201,14 @@ end:
 	return ret;
 }
 
-int lttng_unregister_trigger(struct lttng_trigger *trigger)
+int lttng_unregister_trigger(const struct lttng_trigger *trigger)
 {
 	int ret;
 	struct lttcomm_session_msg lsm;
 	struct lttcomm_session_msg *message_lsm;
 	struct lttng_payload message;
 	struct lttng_payload reply;
+	struct lttng_trigger *copy = NULL;
 	const struct lttng_credentials user_creds = {
 		.uid = LTTNG_OPTIONAL_INIT_VALUE(geteuid()),
 		.gid = LTTNG_OPTIONAL_INIT_UNSET,
@@ -3221,9 +3222,15 @@ int lttng_unregister_trigger(struct lttng_trigger *trigger)
 		goto end;
 	}
 
-	if (!trigger->creds.uid.is_set) {
-		/* Use the client's credentials as the trigger credentials. */
-		lttng_trigger_set_credentials(trigger, &user_creds);
+	copy = lttng_trigger_copy(trigger);
+	if (!copy) {
+		ret = -LTTNG_ERR_UNK;
+		goto end;
+	}
+
+	if (!copy->creds.uid.is_set) {
+		/* Use the client credentials as the trigger credentials */
+		lttng_trigger_set_credentials(copy, &user_creds);
 	} else {
 		/*
 		 * Validate that either the current trigger credentials and the
@@ -3236,8 +3243,7 @@ int lttng_unregister_trigger(struct lttng_trigger *trigger)
 		 * "safety" checks.
 		 */
 		const struct lttng_credentials *trigger_creds =
-				lttng_trigger_get_credentials(trigger);
-
+				lttng_trigger_get_credentials(copy);
 		if (!lttng_credentials_is_equal_uid(trigger_creds, &user_creds)) {
 			if (lttng_credentials_get_uid(&user_creds) != 0) {
 				ret = -LTTNG_ERR_EPERM;
@@ -3246,7 +3252,7 @@ int lttng_unregister_trigger(struct lttng_trigger *trigger)
 		}
 	}
 
-	if (!lttng_trigger_validate(trigger)) {
+	if (!lttng_trigger_validate(copy)) {
 		ret = -LTTNG_ERR_INVALID_TRIGGER;
 		goto end;
 	}
@@ -3266,7 +3272,7 @@ int lttng_unregister_trigger(struct lttng_trigger *trigger)
 	*/
 	message_lsm = (struct lttcomm_session_msg *) message.buffer.data;
 
-	ret = lttng_trigger_serialize(trigger, &message);
+	ret = lttng_trigger_serialize(copy, &message);
 	if (ret < 0) {
 		ret = -LTTNG_ERR_UNK;
 		goto end;
@@ -3294,6 +3300,7 @@ int lttng_unregister_trigger(struct lttng_trigger *trigger)
 
 	ret = 0;
 end:
+	lttng_trigger_destroy(copy);
 	lttng_payload_reset(&message);
 	lttng_payload_reset(&reply);
 	return ret;