Move on-event*.* to event-rule-matches*.*

[lttng-tools.git] / src / common / trigger.c

diff --git a/src/common/trigger.c b/src/common/trigger.c
index ec96fc80b7d804249c8c4f1f395d4a693080fd1e..9dfd74d913c7e06ad0c6343c30ec4bad8555697e 100644 (file)
--- a/src/common/trigger.c
+++ b/src/common/trigger.c
@@ -16,8 +16,8 @@
 #include <lttng/action/action-internal.h>
 #include <lttng/condition/buffer-usage.h>
 #include <lttng/condition/condition-internal.h>
-#include <lttng/condition/on-event-internal.h>
-#include <lttng/condition/on-event.h>
+#include <lttng/condition/event-rule-matches-internal.h>
+#include <lttng/condition/event-rule-matches.h>
 #include <lttng/domain.h>
 #include <lttng/event-expr-internal.h>
 #include <lttng/event-rule/event-rule-internal.h>
@@ -704,6 +704,7 @@ enum lttng_trigger_status lttng_trigger_set_owner_uid(
                struct lttng_trigger *trigger, uid_t uid)
 {
        enum lttng_trigger_status ret = LTTNG_TRIGGER_STATUS_OK;
+       const uid_t euid = geteuid();
        const struct lttng_credentials creds = {
                .uid = LTTNG_OPTIONAL_INIT_VALUE(uid),
                .gid = LTTNG_OPTIONAL_INIT_UNSET,
@@ -715,7 +716,7 @@ enum lttng_trigger_status lttng_trigger_set_owner_uid(
        }
 
        /* Client-side validation only to report a clearer error. */
-       if (geteuid() != 0) {
+       if (euid != 0 && euid != uid) {
                ret = LTTNG_TRIGGER_STATUS_PERMISSION_DENIED;
                goto end;
        }