From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 13 Sep 2013 18:18:10 +0000 (+0100)
Subject: bus-test: only expect GetConnectionUnixProcessID to succeed sometimes
X-Git-Tag: dbus-1.7.6~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ecbe018a07dfd5b1cce5eb0e431f7a5984517c7;p=thirdparty%2Fdbus.git

bus-test: only expect GetConnectionUnixProcessID to succeed sometimes

On platforms that use getpeereid(), this can't work.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=60340
Reviewed-by: Colin Walters <walters@verbum.org>
---

diff --git a/bus/dispatch.c b/bus/dispatch.c
index 35a4b72be..5fc0d112e 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -1307,9 +1307,15 @@ check_get_connection_unix_process_id (BusContext     *context,
 #endif
       else
         {
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
+          defined(__linux__) || \
+          defined(__OpenBSD__)
           warn_unexpected (connection, message, "not this error");
 
           goto out;
+#else
+          _dbus_verbose ("does not support GetConnectionUnixProcessID but perhaps that's OK?\n");
+#endif
         }
     }
   else