Merge pull request #11022 from obsidiansystems/fix-openbsd-socket-pee…

…rcred Use proper struct sockpeercred for SO_PEERCRED for OpenBSD
NixOS · Jul 3, 2024 · 509be0e · 509be0e
2 parents 30de61f + 10ccdb7
commit 509be0e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/nix/unix/daemon.cc b/src/nix/unix/daemon.cc
@@ -203,17 +203,21 @@ static PeerInfo getPeerInfo(int remote)
 
 #if defined(SO_PEERCRED)
 
-    ucred cred;
+# if defined(__OpenBSD__)
+   struct sockpeercred cred;
+# else
+   ucred cred;
+# endif
     socklen_t credLen = sizeof(cred);
     if (getsockopt(remote, SOL_SOCKET, SO_PEERCRED, &cred, &credLen) == -1)
         throw SysError("getting peer credentials");
     peer = { true, cred.pid, true, cred.uid, true, cred.gid };
 
 #elif defined(LOCAL_PEERCRED)
 
-#if !defined(SOL_LOCAL)
-#define SOL_LOCAL 0
-#endif
+# if !defined(SOL_LOCAL)
+# define SOL_LOCAL 0
+# endif
 
     xucred cred;
     socklen_t credLen = sizeof(cred);