X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=0b116e11820ff70ee483c132b2eef4215840a5d9;hb=73664f816b1512231bf44679eea5a3c91ca619ec;hp=9542e650dd6883b3351ae20ca249902259a3d94a;hpb=ade7ce5245446944d27824943142773f7e4d0674;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 9542e650d..0b116e118 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -18,6 +18,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <getopt.h>
 #include <grp.h>
 #include <limits.h>
@@ -3217,12 +3218,14 @@ skip_domain:
 
 			if (bytecode_len > LTTNG_FILTER_MAX_LEN) {
 				ret = LTTNG_ERR_FILTER_INVAL;
+				free(filter_expression);
 				free(exclusion);
 				goto error;
 			}
 
 			bytecode = zmalloc(bytecode_len);
 			if (!bytecode) {
+				free(filter_expression);
 				free(exclusion);
 				ret = LTTNG_ERR_FILTER_NOMEM;
 				goto error;
@@ -3234,6 +3237,7 @@ skip_domain:
 			if (ret <= 0) {
 				DBG("Nothing recv() from client car len data... continuing");
 				*sock_error = 1;
+				free(filter_expression);
 				free(bytecode);
 				free(exclusion);
 				ret = LTTNG_ERR_FILTER_INVAL;
@@ -3241,6 +3245,7 @@ skip_domain:
 			}
 
 			if ((bytecode->len + sizeof(*bytecode)) != bytecode_len) {
+				free(filter_expression);
 				free(bytecode);
 				free(exclusion);
 				ret = LTTNG_ERR_FILTER_INVAL;
@@ -3384,31 +3389,12 @@ skip_domain:
 			goto error;
 		}
 
-		ret = cmd_set_consumer_uri(cmd_ctx->lsm->domain.type, cmd_ctx->session,
-				nb_uri, uris);
+		ret = cmd_set_consumer_uri(cmd_ctx->session, nb_uri, uris);
+		free(uris);
 		if (ret != LTTNG_OK) {
-			free(uris);
 			goto error;
 		}
 
-		/*
-		 * XXX: 0 means that this URI should be applied on the session. Should
-		 * be a DOMAIN enuam.
-		 */
-		if (cmd_ctx->lsm->domain.type == 0) {
-			/* Add the URI for the UST session if a consumer is present. */
-			if (cmd_ctx->session->ust_session &&
-					cmd_ctx->session->ust_session->consumer) {
-				ret = cmd_set_consumer_uri(LTTNG_DOMAIN_UST, cmd_ctx->session,
-						nb_uri, uris);
-			} else if (cmd_ctx->session->kernel_session &&
-					cmd_ctx->session->kernel_session->consumer) {
-				ret = cmd_set_consumer_uri(LTTNG_DOMAIN_KERNEL,
-						cmd_ctx->session, nb_uri, uris);
-			}
-		}
-
-		free(uris);
 
 		break;
 	}
@@ -4241,7 +4227,7 @@ static void usage(void)
 	fprintf(stderr, "      --verbose-consumer             Verbose mode for consumer. Activate DBG() macro.\n");
 	fprintf(stderr, "      --no-kernel                    Disable kernel tracer\n");
 	fprintf(stderr, "      --agent-tcp-port               Agent registration TCP port\n");
-	fprintf(stderr, "  -f  --config                       Load daemon configuration file\n");
+	fprintf(stderr, "  -f  --config PATH                  Load daemon configuration file\n");
 	fprintf(stderr, "  -l  --load PATH                    Load session configuration\n");
 	fprintf(stderr, "      --kmod-probes                  Specify kernel module probes to load\n");
 	fprintf(stderr, "      --extra-kmod-probes            Specify extra kernel module probes to load\n");
@@ -4257,6 +4243,17 @@ static int set_option(int opt, const char *arg, const char *optname)
 {
 	int ret = 0;
 
+	if (arg && arg[0] == '\0') {
+		/*
+		 * This only happens if the value is read from daemon config
+		 * file. This means the option requires an argument and the
+		 * configuration file contains a line such as:
+		 * my_option =
+		 */
+		ret = -EINVAL;
+		goto end;
+	}
+
 	switch (opt) {
 	case 0:
 		fprintf(stderr, "option %s", optname);
@@ -4448,6 +4445,23 @@ static int set_option(int opt, const char *arg, const char *optname)
 		ret = -1;
 	}
 
+end:
+	if (ret == -EINVAL) {
+		const char *opt_name = "unknown";
+		int i;
+
+		for (i = 0; i < sizeof(long_options) / sizeof(struct option);
+			i++) {
+			if (opt == long_options[i].val) {
+				opt_name = long_options[i].name;
+				break;
+			}
+		}
+
+		WARN("Invalid argument provided for option \"%s\", using default value.",
+			opt_name);
+	}
+
 	return ret;
 }
 
@@ -5078,6 +5092,10 @@ int main(int argc, char **argv)
 
 	if (is_root) {
 		rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+		if (!rundir) {
+			ret = -ENOMEM;
+			goto error;
+		}
 
 		/* Create global run dir with root access */
 		ret = create_lttng_rundir(rundir);