X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=078b56a01bb68c49c2322fc2a8f454d597305314;hb=69b8d2fae1590ec792409587123afa55b8959c07;hp=2332dbf1a383d2b2b6e1500fb604039e53ab72e9;hpb=51d9d699fd6ea1da04af9e70b1e624eeaa99659f;p=lttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 2332dbf1..078b56a0 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
+#include <fcntl.h>
 
 #include <ust-comm.h>
 
@@ -119,12 +120,17 @@ int ustcomm_connect_unix_sock(const char *pathname)
 	 * libust threads require the close-on-exec flag for all
 	 * resources so it does not leak file descriptors upon exec.
 	 */
-	fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+	fd = socket(PF_UNIX, SOCK_STREAM, 0);
 	if (fd < 0) {
 		perror("socket");
 		ret = fd;
 		goto error;
 	}
+	ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
+	if (ret < 0) {
+		perror("fcntl");
+		goto error_fcntl;
+	}
 
 	memset(&sun, 0, sizeof(sun));
 	sun.sun_family = AF_UNIX;
@@ -144,6 +150,7 @@ int ustcomm_connect_unix_sock(const char *pathname)
 	return fd;
 
 error_connect:
+error_fcntl:
 	close(fd);
 error:
 	return ret;