From 76ea68c2a77cafe2424fe6bc97403c9d9a6b1e95 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Tue, 20 Nov 2012 21:53:31 -0500 Subject: Support LOCAL_PEEREID (NetBSD) and getpeereid() (FreeBSD) * configure.ac: check for LOCAL_PEEREID and getpeereid(). * src/assuan-socket-server.c (accept_connection_bottom): make use of LOCAL_PEEREID and getpeereid(). -- For use with assuan_get_peercred(). Note that getpeereid() does not set the PID member. LOCAL_PEEREID is checked before getpeereid() since NetBSD has both of these. SO_PEERCRED is still checked first. [Second revision] This revision adds support for LOCAL_PEEREID which NetBSD uses. Its tested against NetBSD 6.0 and may work without problems with earlier versions. FreeBSD uses getpeereid() which does not have PID support. Recent OpenBSD versions do support SO_PEERCRED and old versions have getpeereid() but also may have LOCAL_PEEREID (not sure). --- src/assuan-socket-server.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/assuan-socket-server.c') diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c index 27994a2..1e8e541 100644 --- a/src/assuan-socket-server.c +++ b/src/assuan-socket-server.c @@ -74,6 +74,27 @@ accept_connection_bottom (assuan_context_t ctx) ctx->pid = cr.pid; } } +#elif defined(HAVE_LOCAL_PEEREID) + { + struct unpcbid unp; + socklen_t unpl = sizeof unp; + + if (getsockopt(fd, 0, LOCAL_PEEREID, &unp, &unpl) != -1) + { + ctx->peercred.pid = unp.unp_pid; + ctx->peercred.uid = unp.unp_euid; + ctx->peercred.gid = unp.unp_egid; + ctx->peercred_valid = 1; + } + } +#elif defined(HAVE_GETPEEREID) + { + if (getpeereid(fd, &ctx->peercred.uid, &ctx->peercred.gid) != -1) + { + ctx->peercred.pid = ASSUAN_INVALID_PID; + ctx->peercred_valid = 1; + } + } #endif ctx->inbound.fd = fd; -- cgit v1.2.3