From: David Goulet <dgoulet@efficios.com>
Date: Thu, 1 Mar 2012 18:04:18 +0000 (-0500)
Subject: Merge branch 'master' into compat-freebsd
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=1af0e2e4d4a770e32f4fc169122b0c338bd799f6;hp=a9ade9664f81a422c669f7a043c10479bb82ff42

Merge branch 'master' into compat-freebsd
---

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index 065caee91..05ba6d3a8 100644
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -416,7 +416,7 @@ extern int lttng_add_context(struct lttng_handle *handle,
 		const char *channel_name);
 
 /*
- * Create or enable a kernel event (or events) for a channel.
+ * Create or enable an event (or events) for a channel.
  *
  * If the event you are trying to enable does not exist, it will be created,
  * else it is enabled.
@@ -427,14 +427,14 @@ extern int lttng_enable_event(struct lttng_handle *handle,
 		struct lttng_event *ev, const char *channel_name);
 
 /*
- * Create or enable a kernel channel.
+ * Create or enable a channel.
  * The channel name cannot be NULL.
  */
 extern int lttng_enable_channel(struct lttng_handle *handle,
 		struct lttng_channel *chan);
 
 /*
- * Disable kernel event(s) of a channel and domain.
+ * Disable event(s) of a channel and domain.
  *
  * If event_name is NULL, all events are disabled.
  * If channel_name is NULL, the default channel is used (channel0).
@@ -443,7 +443,7 @@ extern int lttng_disable_event(struct lttng_handle *handle,
 		const char *name, const char *channel_name);
 
 /*
- * Disable kernel channel.
+ * Disable channel.
  *
  * The channel name cannot be NULL.
  */
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 922e81b59..8654031f1 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -4011,7 +4011,7 @@ static int set_permissions(char *rundir)
 	}
 
 	/* Ensure tracing group can search the run dir */
-	ret = chmod(rundir, S_IRWXU | S_IXGRP);
+	ret = chmod(rundir, S_IRWXU | S_IXGRP | S_IXOTH);
 	if (ret < 0) {
 		ERR("Unable to set permissions on %s", rundir);
 		perror("chmod");
diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index ce6332d93..55e73930a 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -236,7 +236,7 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
 		lue->attr.loglevel = ev->loglevel;
 		break;
 	default:
-		ERR("Unknown ust loglevel type (%d)", ev->type);
+		ERR("Unknown ust loglevel type (%d)", ev->loglevel_type);
 		goto error_free_event;
 	}