From 59301ab3f80991086519124d020edbe94a74615c Mon Sep 17 00:00:00 2001 From: Richard Markiewicz Date: Mon, 15 Jun 2020 10:44:25 -0700 Subject: nng: support NNG_OPT_IPC_PEER_PID on modern macOS systems --- src/platform/posix/posix_ipcconn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/platform/posix/posix_ipcconn.c b/src/platform/posix/posix_ipcconn.c index e4d783f3..8dded3a3 100644 --- a/src/platform/posix/posix_ipcconn.c +++ b/src/platform/posix/posix_ipcconn.c @@ -318,7 +318,7 @@ ipc_peerid(ipc_conn *c, uint64_t *euid, uint64_t *egid, uint64_t *prid, uint64_t *znid) { int fd = nni_posix_pfd_fd(c->pfd); -#if defined(NNG_HAVE_GETPEEREID) +#if defined(NNG_HAVE_GETPEEREID) && !defined(NNG_HAVE_LOCALPEERCRED) uid_t uid; gid_t gid; @@ -373,7 +373,7 @@ ipc_peerid(ipc_conn *c, uint64_t *euid, uint64_t *egid, uint64_t *prid, *egid = xu.cr_gid; *prid = (uint64_t) -1; *znid = (uint64_t) -1; -#if defined(LOCAL_PEERPID) // present (undocumented) on macOS +#if defined(NNG_HAVE_LOCALPEERPID) // documented on macOS since 10.8 { pid_t pid; if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &len) == @@ -381,7 +381,7 @@ ipc_peerid(ipc_conn *c, uint64_t *euid, uint64_t *egid, uint64_t *prid, *prid = (uint64_t) pid; } } -#endif // LOCAL_PEERPID +#endif // NNG_HAVE_LOCALPEERPID return (0); #else if (fd < 0) { -- cgit v1.2.3-70-g09d2