diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-11-29 19:24:40 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-11-29 19:25:57 +0000 |
| commit | 56597849906e99f13726942ff1cf3108297233fa (patch) | |
| tree | 250fa02d7a100ef1a83ceb3acad564dbf71769d8 /bus/dispatch.c | |
| parent | 6d40ef87578252e6238d4aa8d19acfac1658eada (diff) | |
| download | dbus-56597849906e99f13726942ff1cf3108297233fa.tar.gz | |
bus test: Accept GetConnectionUnixProcessID() success on Windows
Despite its name, which is a historical quirk, this is now a
generic cross-platform process ID on anything with the concept of
numbered processes. It appears it has actually worked on Windows
since dbus 1.7.x.
Bug: https://gitlab.freedesktop.org/dbus/dbus/issues/239
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'bus/dispatch.c')
| -rw-r--r-- | bus/dispatch.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c index 39d84076..16b6782f 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -1401,9 +1401,7 @@ check_get_connection_unix_process_id (BusContext *context, dbus_bool_t retval; DBusError error; const char *base_service_name; -#ifdef DBUS_UNIX dbus_uint32_t pid; -#endif retval = FALSE; dbus_error_init (&error); @@ -1471,15 +1469,6 @@ check_get_connection_unix_process_id (BusContext *context, { ; /* good, this is a valid response */ } -#ifdef DBUS_WIN - else if (dbus_message_is_error (message, DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN)) - { - /* We are expecting this error, since we know in the test suite we aren't - * talking to a client running on UNIX - */ - _dbus_verbose ("Windows correctly does not support GetConnectionUnixProcessID\n"); - } -#endif else { #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ @@ -1500,10 +1489,6 @@ check_get_connection_unix_process_id (BusContext *context, } else { -#ifdef DBUS_WIN - warn_unexpected (connection, message, "GetConnectionUnixProcessID to fail on Windows"); - goto out; -#else if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_METHOD_RETURN) { ; /* good, expected */ @@ -1552,7 +1537,6 @@ check_get_connection_unix_process_id (BusContext *context, goto out; } } -#endif /* !DBUS_WIN */ } if (!check_no_leftovers (context)) |