X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=23b84db4f9519e209d4477db2a6e645ac9c45157;hb=a5f384aac4e2dca9992fa3758db02b3f17f0f55c;hp=a92bf39125b287528d202d9160e09d7b7c7462f2;hpb=6cf1eedbe1a661a55f6b87cc40c8bb3dfe2abb29;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index a92bf3912..23b84db4f 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -703,7 +703,7 @@ static char *set_jul_filter(const char *filter, struct lttng_event *ev)
 	/* Don't add filter for the '*' event. */
 	if (ev->name[0] != '*') {
 		if (filter) {
-			err = asprintf(&jul_filter, "%s && logger_name == \"%s\"", filter,
+			err = asprintf(&jul_filter, "(%s) && (logger_name == \"%s\")", filter,
 					ev->name);
 		} else {
 			err = asprintf(&jul_filter, "logger_name == \"%s\"", ev->name);
@@ -727,7 +727,7 @@ static char *set_jul_filter(const char *filter, struct lttng_event *ev)
 		if (filter || jul_filter) {
 			char *new_filter;
 
-			err = asprintf(&new_filter, "%s && int_loglevel %s %d",
+			err = asprintf(&new_filter, "(%s) && (int_loglevel %s %d)",
 					jul_filter ? jul_filter : filter, op,
 					ev->loglevel);
 			if (jul_filter) {
@@ -1056,7 +1056,7 @@ int lttng_disable_event(struct lttng_handle *handle, const char *name,
 
 	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	if (name != NULL) {
+	if (name != NULL && *name != '*') {
 		lttng_ctl_copy_string(lsm.u.disable.name, name,
 				sizeof(lsm.u.disable.name));
 		lsm.cmd_type = LTTNG_DISABLE_EVENT;