Attachment 85789 Details for Bug 60340 – [4/6] Prefer getpeerucred() over getpeereid() if a platform has both

[patch] [4/6] Prefer getpeerucred() over getpeereid() if a platform has both

0003-Prefer-getpeerucred-over-getpeereid-if-a-platform-ha.patch (text/plain), 3.33 KB, created by Simon McVittie on 2013-09-13 18:26:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-13 18:26:52 UTC

Size: 3.33 KB

patch

obsolete

>From 17b1798e443056865a2f82fa3979110207343067 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 3/5] Prefer getpeerucred() over getpeereid() if a platform has
> both
>
>We want the process ID, and getpeerucred() provides that.
>---
> 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 122c04a..cc3f5c4 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
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 60340: 74261 | 74677 | 74679 | 74680 | 74698 | 75145 | 85786 | 85787 | 85788 | 85789 | 85790 | 85791

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.