X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Funix.c;h=5e0ba62812307d239a6d2f9db76475deb481a976;hp=cf285c7e2dc83e8bb8c92d9d45769d589c1015a5;hb=fbb1fd3a999509ca90c49577e53a47c23433d6f5;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9

diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c
index cf285c7e2..5e0ba6281 100644
--- a/src/common/sessiond-comm/unix.c
+++ b/src/common/sessiond-comm/unix.c
@@ -182,7 +182,7 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
 
 	do {
 		len_last = iov[0].iov_len;
-		ret = recvmsg(sock, &msg, MSG_NOSIGNAL);
+		ret = lttng_recvmsg_nosigpipe(sock, &msg);
 		if (ret > 0) {
 			iov[0].iov_base += ret;
 			iov[0].iov_len -= ret;
@@ -524,7 +524,7 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 	}
 
 	memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__))
 	{
 		int peer_ret;
 
@@ -557,7 +557,7 @@ int lttcomm_setsockopt_creds_unix_sock(int sock)
 	}
 	return ret;
 }
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__))
 LTTNG_HIDDEN
 int lttcomm_setsockopt_creds_unix_sock(int sock)
 {