From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 4 Mar 2015 12:11:20 +0000 (+0000)
Subject: dbus-print-message: conditionalize Unix FD handling on DBUS_UNIX
X-Git-Tag: dbus-1.9.16~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58f66e6c408adc5c9f9bcecef55e5b7cdf787110;p=thirdparty%2Fdbus.git

dbus-print-message: conditionalize Unix FD handling on DBUS_UNIX

We close() the fd after we have printed it, but close() isn't
standard functionality on Windows. Unix FD-passing is never going
to work on non-Unix platforms anyway.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89428
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index bd0817c06..1891da77a 100644
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -505,6 +505,7 @@ print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
             break;
           }
 
+#ifdef DBUS_UNIX
         case DBUS_TYPE_UNIX_FD:
           {
             int fd;
@@ -520,6 +521,7 @@ print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
 
             break;
           }
+#endif
 
         default:
           printf (" (dbus-monitor too dumb to decipher arg type '%c')\n", type);