From 5212ea55c713f0b63874950de287059c87110873 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 13 Sep 2013 18:51:34 +0100
Subject: [PATCH] Prefer getpeerucred() over getpeereid() if a platform has
 both

We want the process ID, and getpeerucred() provides that.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=60340
Reviewed-by: Colin Walters <walters@verbum.org>
---
 dbus/dbus-sysdeps-unix.c | 63 ++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 0a2b311..17c8411 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -1761,37 +1761,6 @@ _dbus_read_credentials_socket  (int              client_fd,
     pid_read = cred->cmcred_pid;
     uid_read = cred->cmcred_euid;
 
-    /* ----------------------------------------------------------------
-     * When adding new mechanisms, please add them above this point
-     * if they support passing the process ID through, or below if not.
-     * ---------------------------------------------------------------- */
-
-#elif defined(HAVE_GETPEEREID)
-    /* getpeereid() originates from D.J. Bernstein and is fairly
-     * widely-supported. According to a web search, it might be present in
-     * any/all of:
-     *
-     * - AIX?
-     * - Blackberry?
-     * - Cygwin
-     * - FreeBSD 4.6+ (but we prefer SCM_CREDS: it carries the pid)
-     * - Mac OS X
-     * - Minix 3.1.8+
-     * - MirBSD?
-     * - NetBSD 5.0+ (but LOCAL_PEEREID would be better: it carries the pid)
-     * - OpenBSD 3.0+ (but we prefer SO_PEERCRED: it carries the pid)
-     * - QNX?
-     */
-    uid_t euid;
-    gid_t egid;
-    if (getpeereid (client_fd, &euid, &egid) == 0)
-      {
-        uid_read = euid;
-      }
-    else
-      {
-        _dbus_verbose ("Failed to getpeereid() credentials: %s\n", _dbus_strerror (errno));
-      }
 #elif defined(HAVE_GETPEERUCRED)
     /* Supported in at least Solaris >= 10. It should probably be higher
      * up this list, because it carries the pid and we use this code path
@@ -1839,6 +1808,38 @@ _dbus_read_credentials_socket  (int              client_fd,
       }
     if (ucred != NULL)
       ucred_free (ucred);
+
+    /* ----------------------------------------------------------------
+     * When adding new mechanisms, please add them above this point
+     * if they support passing the process ID through, or below if not.
+     * ---------------------------------------------------------------- */
+
+#elif defined(HAVE_GETPEEREID)
+    /* getpeereid() originates from D.J. Bernstein and is fairly
+     * widely-supported. According to a web search, it might be present in
+     * any/all of:
+     *
+     * - AIX?
+     * - Blackberry?
+     * - Cygwin
+     * - FreeBSD 4.6+ (but we prefer SCM_CREDS: it carries the pid)
+     * - Mac OS X
+     * - Minix 3.1.8+
+     * - MirBSD?
+     * - NetBSD 5.0+ (but LOCAL_PEEREID would be better: it carries the pid)
+     * - OpenBSD 3.0+ (but we prefer SO_PEERCRED: it carries the pid)
+     * - QNX?
+     */
+    uid_t euid;
+    gid_t egid;
+    if (getpeereid (client_fd, &euid, &egid) == 0)
+      {
+        uid_read = euid;
+      }
+    else
+      {
+        _dbus_verbose ("Failed to getpeereid() credentials: %s\n", _dbus_strerror (errno));
+      }
 #else /* no supported mechanism */
     _dbus_verbose ("Socket credentials not supported on this OS\n");
 #endif
-- 
2.7.4