From: David Goulet <dgoulet@efficios.com>
Date: Fri, 2 Mar 2012 20:19:52 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0.0-rc3~17
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=52b07d8a5f38946bea3176d486c1934ca7639415;hp=a186a15913c34e8adc83ea71565d3b0eec296774

Merge branch 'master' of git://git.lttng.org/lttng-tools
---

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 2ef18ae09..a4f0d054d 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1473,7 +1473,7 @@ error:
 			PERROR("close");
 		}
 	}
-	if (clock >= 0) {
+	if (sock >= 0) {
 		ret = close(sock);
 		if (ret) {
 			PERROR("close");