X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fstop.c;h=fbabc510039f2f5fc8c5486b6240bf64d6326780;hp=689fe1b04998f8451d8c5018670ab5d1b25f1f65;hb=d14d33bf091e72b23b1f90ea18a0a01bed098b76;hpb=ca1c3607d2f5654163875cda874f43971df0f696

diff --git a/src/bin/lttng/commands/stop.c b/src/bin/lttng/commands/stop.c
index 689fe1b04..fbabc5100 100644
--- a/src/bin/lttng/commands/stop.c
+++ b/src/bin/lttng/commands/stop.c
@@ -1,19 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -61,7 +60,7 @@ static void usage(FILE *ofp)
  */
 static int stop_tracing(void)
 {
-	int ret = CMD_SUCCESS;
+	int ret;
 	char *session_name;
 
 	if (opt_session_name == NULL) {
@@ -76,9 +75,12 @@ static int stop_tracing(void)
 
 	ret = lttng_stop_tracing(session_name);
 	if (ret < 0) {
+		/* Don't set ret so lttng can interpret the sessiond error. */
 		goto free_name;
 	}
 
+	ret = CMD_SUCCESS;
+
 	MSG("Tracing stopped for session %s", session_name);
 
 free_name: