diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2005-10-12 22:15:37 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2005-10-12 22:15:37 +0000 |
| commit | 8d2fe98783ca1747db920fa702de66a2910d3cd1 (patch) | |
| tree | 3a6ac2b7c25540dd626cd3399b1dbdabd3d8e846 /dbus/dbus-connection.c | |
| parent | f9e96c54cd2bad250179b2992870f8c27ae7e65d (diff) | |
patches from Michael Krivoruchko <misha at sun.com>:
* dbus/dbus-connection.c (_dbus_connection_queue_received_message_link,
_dbus_connection_message_sent,
_dbus_connection_send_preallocated_unlocked_no_update,
_dbus_connection_pop_message_link_unlocked): handle the case when path
is NULL when calling _dbus_verbose
* configure.in: check for functions getpeerucred and getpeereid
* dbus/dbus-sysdeps.c (_dbus_read_credentials_unix_socket): provides
support of auth EXTERNAL on Solaris 10+ (getpeerucred), FreeBSD 4.6+,
OpenBSD 3.0+ and FreeBSD 5.0+ as well as MacOSX 10.2+ (getpeereid).
Patch was only tested on Solaris 10 x86 so it might be issues
with other platforms (i.e. BSDs and MacOSX)
Diffstat (limited to 'dbus/dbus-connection.c')
| -rw-r--r-- | dbus/dbus-connection.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 1e699617..31aea4c9 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -391,7 +391,9 @@ _dbus_connection_queue_received_message_link (DBusConnection *connection, _dbus_verbose ("Message %p (%d %s %s %s '%s' reply to %u) added to incoming queue %p, %d incoming\n", message, dbus_message_get_type (message), - dbus_message_get_path (message), + dbus_message_get_path (message) ? + dbus_message_get_path (message) : + "no path", dbus_message_get_interface (message) ? dbus_message_get_interface (message) : "no interface", @@ -515,7 +517,9 @@ _dbus_connection_message_sent (DBusConnection *connection, _dbus_verbose ("Message %p (%d %s %s %s '%s') removed from outgoing queue %p, %d left to send\n", message, dbus_message_get_type (message), - dbus_message_get_path (message), + dbus_message_get_path (message) ? + dbus_message_get_path (message) : + "no path", dbus_message_get_interface (message) ? dbus_message_get_interface (message) : "no interface", @@ -2163,7 +2167,9 @@ _dbus_connection_send_preallocated_unlocked_no_update (DBusConnection *con _dbus_verbose ("Message %p (%d %s %s %s '%s') for %s added to outgoing queue %p, %d pending to send\n", message, dbus_message_get_type (message), - dbus_message_get_path (message), + dbus_message_get_path (message) ? + dbus_message_get_path (message) : + "no path", dbus_message_get_interface (message) ? dbus_message_get_interface (message) : "no interface", @@ -3046,7 +3052,9 @@ _dbus_connection_pop_message_link_unlocked (DBusConnection *connection) _dbus_verbose ("Message %p (%d %s %s %s '%s') removed from incoming queue %p, %d incoming\n", link->data, dbus_message_get_type (link->data), - dbus_message_get_path (link->data), + dbus_message_get_path (link->data) ? + dbus_message_get_path (link->data) : + "no path", dbus_message_get_interface (link->data) ? dbus_message_get_interface (link->data) : "no interface", |