From 1f844b2d0e3090cd6894eca990b761ca3a98f634 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Wed, 18 Mar 2015 08:41:43 +0000 Subject: [PATCH] common: workaround for #146 --- common/os_calls.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/common/os_calls.c b/common/os_calls.c index 611cf420..50d7e549 100644 --- a/common/os_calls.c +++ b/common/os_calls.c @@ -86,6 +86,12 @@ extern char **environ; #include #endif +/* sys/ucred.h needs to be included to use struct xucred + * in FreeBSD and OS X. No need for other BSDs */ +#if defined(__FreeBSD__) || defined(__APPLE__) +#include +#endif + /* for solaris */ #if !defined(PF_LOCAL) #define PF_LOCAL AF_UNIX @@ -656,6 +662,28 @@ g_sck_get_peer_cred(int sck, int *pid, int *uid, int *gid) *gid = credentials.gid; } return 0; +#elif defined(LOCAL_PEERCRED) + /* FreeBSD, OS X reach here*/ + struct xucred xucred; + unsigned int xucred_length; + xucred_length = sizeof(xucred); + + if (getsockopt(sck, SOL_SOCKET, LOCAL_PEERCRED, &xucred, &xucred_length)) + { + return 1; + } + if (pid !=0) + { + *pid = 0; /* can't get pid in FreeBSD, OS X */ + } + if (uid != 0) + { + *uid = xucred.cr_uid; + } + if (gid != 0) { + *gid = xucred.cr_gid; + } + return 0; #else return 1; #endif