Merge branch 'master' into compat-freebsd

[lttng-tools.git] / src / common / sessiond-comm / sessiond-comm.c

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 20baaaf7b0dfafa2cd660d492eb0162367625dbe..3b224c6ff76e7414c7e140b955bdb27c16d60e8e 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -541,9 +541,13 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 
        memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
 #elif defined(__FreeBSD__)
-       ret = getpeereid(sock, &creds->uid, &creds->gid);
-       if (ret != 0) {
-               return ret;
+       {
+               int peer_ret;
+
+               peer_ret = getpeereid(sock, &creds->uid, &creds->gid);
+               if (peer_ret != 0) {
+                       return peer_ret;
+               }
        }
 #else
 #error "Please implement credential support for your OS."